Jaewan Kim
dbe270ce05
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev am: bde4eb5bcb
...
am: 6b2d5be466
Change-Id: I3d542488d089b926662644d124098ca229fa5450
2017-04-17 18:11:06 +00:00
Tyler Gunn
13fdc917d2
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev am: 790ec07c26
...
am: e935b6e544 -s ours
Change-Id: Icd8f538d2cd20ead660376ca7bd7f2fbf6348aea
2017-04-17 18:09:20 +00:00
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
b86d741f1f
Merge "Don't back up disabled apps" into oc-dev am: 628690ea2b
...
am: 281def0704
Change-Id: Ibbb8403bdf68d6a55b67ee361b578e2aa767bb42
2017-04-17 17:52:21 +00:00
Rebecca Silberstein
1e96a0968b
Merge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 am: 2dda9f5d66" into oc-dev-plus-aosp
...
am: a7cba48907
Change-Id: Id27920b3012adde075cfc270b14b5378037913c0
2017-04-17 17:50:44 +00:00
Yoshinori Hirano
bd2e0ace14
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev am: 1afa1646a2
...
am: 8a323ab65f
Change-Id: I7003321f7d5a66ec73d0e7f7765be3135a06536e
2017-04-17 17:49:23 +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
f3276baa03
Merge "media: Address API review comments" into oc-dev am: ab312729ce
...
am: bde6da6f18
Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f
2017-04-17 17:20:20 +00:00
Andrii Kulian
058e1908b2
Merge "Temporary remove resource-display caching" into oc-dev am: 8f4bd67929
...
am: 8063101678
Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400
2017-04-17 17:17:19 +00:00
Bryce Lee
242a4f6e5d
Merge "Don't allow stacks above pinned stack." into oc-dev am: 22d4ef008d
...
am: e7ac364ae1
Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54
2017-04-17 17:16:09 +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
TreeHugger Robot
71483a891a
Merge "use sk_sp to manage colortables"
2017-04-17 17:11:33 +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
Dianne Hackborn
bcc7cebcdb
Merge "Fix issue #35811414 : Allow manifest receivers for ACTION_UID_REMOVED"
2017-04-17 17:03:00 +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
Android Build Merger (Role)
a5fefb2fe2
Merge "Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec am: 17bc64597c"
2017-04-17 16:53:33 +00:00
Jordan Liu
c0c2c99929
Merge "Update api for ServiceStateProvider"
2017-04-17 16:53:17 +00:00
Sundeep Ghuman
f509d526b8
Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec
...
am: 17bc64597c
Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e
2017-04-17 16:52:31 +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
Julia Reynolds
1ab0f123bb
Merge "Also use the notification's sound for the misc channel" into oc-dev am: ed8f49efdc
...
am: f6ca4cfcd2
Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
2017-04-17 16:42:07 +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
39e00e1203
Merge "Remove @removed method" into oc-dev am: bbcf5fba1c
...
am: 211d99d1b9
Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0
2017-04-17 15:17:48 +00: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
56f715160e
Merge "expose the instant app installer component" into oc-dev am: 676590d060
...
am: 8d0dacb5b1
Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
2017-04-17 14:32:38 +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
d9c01f2532
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev am: 5fc6e63e2e
...
am: 18a6331772
Change-Id: I854db28eaf942b8d4b6035ccc35be65bf4eee774
2017-04-17 07:39:11 +00: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
