drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
314,943 Commits 1 Branch 0 Tags
Commit Graph

314943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewan Kim
6b2d5be466 Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev 
am: bde4eb5bcb

Change-Id: I0b81c971b5b466e967b8255cfc400c780c9078ba
 2017-04-17 18:00:26 +00:00
Tyler Gunn
e935b6e544 Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev 
am: 790ec07c26

Change-Id: I6f5294d93d11d72b2d14795b22757e68259b0c95
 2017-04-17 17:58:49 +00:00
TreeHugger Robot
bde4eb5bcb Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev 2017-04-17 17:53:20 +00:00
Chris Tate
281def0704 Merge "Don't back up disabled apps" into oc-dev 
am: 628690ea2b

Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462
 2017-04-17 17:44:18 +00:00
Android Build Merger (Role)
a7cba48907 Merge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 am: 2dda9f5d66" into oc-dev-plus-aosp 2017-04-17 17:41:11 +00:00
Tyler Gunn
790ec07c26 Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev 2017-04-17 17:40:50 +00:00
Rebecca Silberstein
3c29ff8835 Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 
am: 2dda9f5d66

Change-Id: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3
 2017-04-17 17:39:55 +00:00
Yoshinori Hirano
8a323ab65f Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev 
am: 1afa1646a2

Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80
 2017-04-17 17:39:45 +00:00
Tyler Gunn
346892ff9f DO NOT MERGE Expose phone account register/unregister intents. 
These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
(cherry picked from commit d9da6ce9938b4222cfb409f172cacfe4cf1593e6)
 2017-04-17 17:39:22 +00:00
Chris Tate
628690ea2b Merge "Don't back up disabled apps" into oc-dev 2017-04-17 17:35:52 +00:00
Rebecca Silberstein
2dda9f5d66 Merge "WifiManager: add new methods to start softap" am: be2653d41e 
am: 334fe54661

Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6
 2017-04-17 17:30:08 +00:00
TreeHugger Robot
1afa1646a2 Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev 2017-04-17 17:28:38 +00:00
Rebecca Silberstein
334fe54661 Merge "WifiManager: add new methods to start softap" 
am: be2653d41e

Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
 2017-04-17 17:20:42 +00:00
Hangyu Kuang
bde6da6f18 Merge "media: Address API review comments" into oc-dev 
am: ab312729ce

Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe
 2017-04-17 17:13:17 +00:00
Rebecca Silberstein
be2653d41e Merge "WifiManager: add new methods to start softap" 2017-04-17 17:10:39 +00:00
Andrii Kulian
8063101678 Merge "Temporary remove resource-display caching" into oc-dev 
am: 8f4bd67929

Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5
 2017-04-17 17:08:29 +00:00
Bryce Lee
e7ac364ae1 Merge "Don't allow stacks above pinned stack." into oc-dev 
am: 22d4ef008d

Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1
 2017-04-17 17:07:09 +00:00
Hangyu Kuang
ab312729ce Merge "media: Address API review comments" into oc-dev 2017-04-17 17:04:28 +00:00
Andrii Kulian
8f4bd67929 Merge "Temporary remove resource-display caching" into oc-dev 2017-04-17 17:00:06 +00:00
Bryce Lee
22d4ef008d Merge "Don't allow stacks above pinned stack." into oc-dev 2017-04-17 16:57:17 +00:00
Andrii Kulian
cff2f814a8 Temporary remove resource-display caching 
An instance of ResourceKey may correspond to different instances
of Resources at different points in time. This can lead to old
instances of Display returned from cache even if resources have
changed.
We need to ensure 1:1 correspondence between Resources and
ResourceKey before using this kind of cache. Disabling it for now
to fix CTS.

Change-Id: Ib53550c4f2d969c06a570ab6051529269b04b38d
Fixes: 37328072
Fixes: 37305567
Bug: 33430498
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: android.app.cts.DisplayTest#testRotation
 2017-04-17 16:56:55 +00:00
Sundeep Ghuman
17bc64597c Merge "Synchronously update APs in during forceUpdate." into oc-dev 
am: 6bdbc4abec

Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3
 2017-04-17 16:42:31 +00:00
TreeHugger Robot
6bdbc4abec Merge "Synchronously update APs in during forceUpdate." into oc-dev 2017-04-17 16:35:00 +00:00
Julia Reynolds
f6ca4cfcd2 Merge "Also use the notification's sound for the misc channel" into oc-dev 
am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
 2017-04-17 16:33:11 +00:00
TreeHugger Robot
ed8f49efdc Merge "Also use the notification's sound for the misc channel" into oc-dev 2017-04-17 16:23:55 +00:00
Yoshinori Hirano
2696aa3577 Fix EmergencyCryptKeeperText initialization 
Moved the initialization to CollapsedStatusBarFragment
because EmergencyCryptKepperText is included in status_bar.xml

Bug: 37198942
Test: visual

Change-Id: I1b87e4857cea7f7b582f7e0f6062b70da98df13a
 2017-04-17 11:29:59 -04:00
Julia Reynolds
211d99d1b9 Merge "Remove @removed method" into oc-dev 
am: bbcf5fba1c

Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
 2017-04-17 15:09:24 +00:00
TreeHugger Robot
bbcf5fba1c Merge "Remove @removed method" into oc-dev 2017-04-17 15:01:54 +00:00
Julia Reynolds
b9e712ebde Also use the notification's sound for the misc channel 
Even if it's nonexistent.

Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045
 2017-04-17 14:33:30 +00:00
Todd Kennedy
8d0dacb5b1 Merge "expose the instant app installer component" into oc-dev 
am: 676590d060

Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
 2017-04-17 14:22:35 +00:00
TreeHugger Robot
676590d060 Merge "expose the instant app installer component" into oc-dev 2017-04-17 14:17:27 +00:00
Jaewan Kim
e630923b55 TV PIP: Remove onboarding activity and overlay activity 
Remove both activities until the new OC UX spec is finalized.

Bug: 36370535
Test: Manual test (Checked that onboarding nor overlay activities aren't
    shown after the FDR)
Change-Id: I97c4b2038aabf4f00cac957af6b79dcd874000ae
 2017-04-17 19:36:27 +09:00
Jaewan Kim
18a6331772 Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 
am: 5fc6e63e2e

Change-Id: I8a444b4b36fe01097dc3c4e21e0df8294ada56a1
 2017-04-17 07:29:40 +00:00
TreeHugger Robot
5fc6e63e2e Merge "MediaSessionService: Cache active sessions per an user" into oc-dev 2017-04-17 07:21:01 +00:00
Erik Kline
feac32ced9 Merge changes I76ae853c,If94102c7 into oc-dev 
am: 7eb8260236

Change-Id: I29e7e076b74842098d5de36aa965a736f1a2863c
 2017-04-17 05:19:35 +00:00
TreeHugger Robot
7eb8260236 Merge changes I76ae853c,If94102c7 into oc-dev 
* changes:
  Ignore potential SystemProperties errors when setting net.dns
  Make ConnectivityServiceTest pass on wifi-only devices.
 2017-04-17 05:11:21 +00:00
Winson Chung
4cc5518c80 Use vsync choreographer when moving PIP. 
am: 487737b876

Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
 2017-04-17 01:50:43 +00:00
Winson Chung
487737b876 Use vsync choreographer when moving PIP. 
Bug: 36371375
Test: Enter PIP, move PIP
Change-Id: I5956a3ed9e92a4cdd4bf0a55723b9f1574c1a86f
 2017-04-16 16:45:18 -07:00
Tyler Gunn
03dbae246e Merge "Expose phone account register/unregister intents." am: 24299f5b06 am: b993a44272 
am: d046aa9103

Change-Id: Iece85cdaee561d2e32c634bed2f2bc03a635450c
 2017-04-15 22:28:09 +00:00
Nathan Harold
23e6899924 Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am: 02278a5a02 am: d50a325553 
am: 661278432d

Change-Id: Ie6ed56a31df7a4b9e0730693561786562eb42fc9
 2017-04-15 22:26:36 +00:00
Rebecca Silberstein
f7ff103c55 Merge "Add a default SSID prefix for local only hotspot" into oc-dev 
am: d8837b6fca

Change-Id: I8703b838c83a71f5be27d07e1a514bf4c8d22a17
 2017-04-15 20:42:34 +00:00
Rebecca Silberstein
d8837b6fca Merge "Add a default SSID prefix for local only hotspot" into oc-dev 2017-04-15 20:37:37 +00:00
Ray Essick
b3934d9043 Merge "Rework getMetrics() api per API council" into oc-dev 
am: abbea1df6b

Change-Id: I9b8911d615e9521007a1cbb14514d05aef172f57
 2017-04-15 19:01:18 +00:00
TreeHugger Robot
abbea1df6b Merge "Rework getMetrics() api per API council" into oc-dev 2017-04-15 18:52:06 +00:00
Yifan Hong
6955963d18 Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev 
am: 35edfc1fdc

Change-Id: I0b604d7e6faf1b72bb7271fbb4ad7056f9d800ae
 2017-04-15 10:04:52 +00:00
TreeHugger Robot
35edfc1fdc Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev 2017-04-15 10:01:25 +00:00
Stephen Chen
45a1fa12c0 Merge "Remove ScoredNetwork.BADGING constants." into oc-dev 
am: e587591c5a

Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
 2017-04-15 09:13:41 +00:00
TreeHugger Robot
e587591c5a Merge "Remove ScoredNetwork.BADGING constants." into oc-dev 2017-04-15 09:04:35 +00:00
Kevin Chyn
54b5b6d710 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 
am: 4ea09f5ca4

Change-Id: I9aa9104818078c058f5f5cefaf3e442873a072e8
 2017-04-15 07:11:00 +00:00
TreeHugger Robot
4ea09f5ca4 Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev 2017-04-15 07:05:48 +00:00