OSDN Git Service
Andrii Kulian [Thu, 29 Jun 2017 02:25:33 +0000 (02:25 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev am:
36dbd3d43f
am:
c8cccd7621
Change-Id: I8d67796f837783494188a841a5168b0672c1f225
Robert Carr [Thu, 29 Jun 2017 02:24:23 +0000 (02:24 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev am:
e33c33e38a
am:
1c89591f94
Change-Id: Ife4908481549c956a23118ce5f8422161cc73d9e
Eugene Susla [Thu, 29 Jun 2017 02:23:11 +0000 (02:23 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev am:
c55f7d2180
am:
8e079af6ad
Change-Id: I739f5aa80a75f34230593173f2536fe8d0e33bca
John Reck [Thu, 29 Jun 2017 02:21:44 +0000 (02:21 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev am:
38c97237e3
am:
14fe0b69c7
Change-Id: I9e75af1654188288d57653c754df56855eed5564
Jorim Jaggi [Thu, 29 Jun 2017 02:20:34 +0000 (02:20 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev am:
a96d749140
am:
3bd6012cee
Change-Id: I3a148e593f5d1bf7f397567719244453adb3541c
Evan Laird [Thu, 29 Jun 2017 02:19:21 +0000 (02:19 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev am:
91870d1587
am:
090807e840
Change-Id: I1a8d503b9d769b1535fe77b2fd5e6ef69fde7987
Evan Laird [Thu, 29 Jun 2017 02:12:02 +0000 (02:12 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
am:
423022e8ab
Change-Id: I5f81cfde196fc801c4141c35e708d8f27032c621
TreeHugger Robot [Thu, 29 Jun 2017 02:00:51 +0000 (02:00 +0000)]
Merge "resolve merge conflicts of
91870d158748 to oc-dr1-dev" into oc-dr1-dev
Andrii Kulian [Thu, 29 Jun 2017 01:57:32 +0000 (01:57 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
am:
36dbd3d43f
Change-Id: I30a4083e9c8467dd8698b50f0999b5ae20f2e01c
Lucas Dupin [Thu, 29 Jun 2017 01:53:04 +0000 (01:53 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
am:
4b535d93f7
Change-Id: I74f15490d9a71386230fd6f326bd0a1866c7f7d3
Andrii Kulian [Thu, 29 Jun 2017 01:47:41 +0000 (01:47 +0000)]
Merge "Further restrict activity launch on virtual displays" into oc-dev
TreeHugger Robot [Thu, 29 Jun 2017 01:43:52 +0000 (01:43 +0000)]
Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev
* changes:
Revert "Replaced overlay target package"
Revert "Support dark text on Recents"
Robert Carr [Thu, 29 Jun 2017 00:26:35 +0000 (00:26 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
am:
e33c33e38a
Change-Id: Ie0733cb79acbe34536c4c031f1234dac134841d3
TreeHugger Robot [Thu, 29 Jun 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Disable requestVisibleBehind." into oc-dev
Matthew Ng [Thu, 29 Jun 2017 00:16:12 +0000 (00:16 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
am:
eb36d83901
Change-Id: I01f2882da4d75a127a872858b351130f6da6aa1e
TreeHugger Robot [Thu, 29 Jun 2017 00:09:25 +0000 (00:09 +0000)]
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev
Eugene Susla [Thu, 29 Jun 2017 00:03:08 +0000 (00:03 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
am:
c55f7d2180
Change-Id: I9386692da93413a6b9fec51045d003fba5284401
TreeHugger Robot [Wed, 28 Jun 2017 23:54:49 +0000 (23:54 +0000)]
Merge "[Companion] Dont crash if started with bluetooth off" into oc-dev
Mady Mellor [Wed, 28 Jun 2017 23:53:23 +0000 (23:53 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
am:
176f2533a1
Change-Id: Ic5d38c862c155ac025884e53d688826b57829529
TreeHugger Robot [Wed, 28 Jun 2017 23:45:37 +0000 (23:45 +0000)]
Merge "Adjustments to PIP position while flinging" into oc-dr1-dev
Andrii Kulian [Wed, 28 Jun 2017 23:21:07 +0000 (16:21 -0700)]
Further restrict activity launch on virtual displays
Only callers with INTERNAL_SYSTEM_WINDOW permission can launch
an activity to a virtual display.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: I3f618fcbf3c07e5085e2b43b0f038f240df0c9d3
Lucas Dupin [Wed, 28 Jun 2017 23:00:39 +0000 (16:00 -0700)]
Revert "Replaced overlay target package"
This reverts commit
ae885416dddd684fab2369fde234dc9e48db5051.
Lucas Dupin [Wed, 28 Jun 2017 23:00:26 +0000 (16:00 -0700)]
Revert "Support dark text on Recents"
This reverts commit
512ce6c9b75ce7d3f4f70280a414ab8fb994e809.
John Reck [Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
am:
38c97237e3
Change-Id: I3ef75aea36939b1dffa44500097709ef51787a1d
John Reck [Wed, 28 Jun 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Selectively disable filtering if estimated safe" into oc-dev
Jorim Jaggi [Wed, 28 Jun 2017 22:05:47 +0000 (22:05 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
am:
a96d749140
Change-Id: I2476d7710bff82e3eeedc0f48f61b57e392efbe7
Evan Laird [Wed, 28 Jun 2017 22:00:02 +0000 (18:00 -0400)]
resolve merge conflicts of
91870d158748 to oc-dr1-dev
Test: mp sysuig; visual
Change-Id: Id329cd7f08667b29e8d430cff6576d8894cd9cf4
Jorim Jaggi [Wed, 28 Jun 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Properly check for orientation mismatch" into oc-dev
Evan Laird [Wed, 28 Jun 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
am:
91870d1587
Change-Id: Ie05d24e13dd2975d45acb59e594df0240d54c460
Charlie Wang [Wed, 28 Jun 2017 21:37:55 +0000 (21:37 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
am:
b5e79ad0d3
Change-Id: I717159a360b1aeb2f928c88b76ad060f4d8516c7
Alison Cichowlas [Wed, 28 Jun 2017 21:30:46 +0000 (21:30 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
am:
29c70316df
Change-Id: Ia1864af61669029ac5596d3477b3d959e824422a
Evan Laird [Wed, 28 Jun 2017 21:30:15 +0000 (21:30 +0000)]
Merge "Fix empty signal line thickness / color in status bar" into oc-dev
Android Build Merger (Role) [Wed, 28 Jun 2017 21:26:45 +0000 (21:26 +0000)]
Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff am:
aec87eab5b" into oc-dr1-dev-plus-aosp
Charlie Wang [Wed, 28 Jun 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Adding fields for time elapsed for headset device events." into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:25:36 +0000 (21:25 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
aec87eab5b
Change-Id: I615ef6fb2fa5786895a385f721bc929df780906f
Phil Weaver [Wed, 28 Jun 2017 21:24:42 +0000 (21:24 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev am:
bb8a7983ff
am:
2bf63f4fde
Change-Id: I5a6fe8947017b7a8b3cfdf41c4b5583dc114bf44
Alison Cichowlas [Wed, 28 Jun 2017 21:23:49 +0000 (21:23 +0000)]
Merge "This import got lost in the merge. Restore to fix build." into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 21:19:19 +0000 (21:19 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
am:
587b673e5b
Change-Id: I0c7b9118cdf37f321772865caa835cdb76b79b97
Brad Ebinger [Wed, 28 Jun 2017 21:17:52 +0000 (21:17 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
am:
58d47a6f04 -s ours
Change-Id: Ie857dfb83ecbfd36f965ad91caddcf3b80848e20
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee
Phil Weaver [Wed, 28 Jun 2017 21:17:42 +0000 (21:17 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
am:
bb8a7983ff
Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d
Jason Monk [Wed, 28 Jun 2017 21:14:43 +0000 (21:14 +0000)]
Merge "NavBar: Don't reorient as much, its a waste of work" into oc-dr1-dev
Phil Weaver [Wed, 28 Jun 2017 21:09:03 +0000 (21:09 +0000)]
Merge "Don't break key event stream when enabling a11y" into oc-dev
Brad Ebinger [Wed, 28 Jun 2017 21:06:34 +0000 (21:06 +0000)]
Merge "IMS: Check for binderstate before calling endSession" into oc-dr1-dev
Hall Liu [Wed, 28 Jun 2017 20:53:00 +0000 (20:53 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb am:
761bad1c53
am:
8f42a3a281
Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c
Hall Liu [Wed, 28 Jun 2017 20:51:57 +0000 (20:51 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb am:
8763c625a3
am:
fc156f357a
Change-Id: I929fd3306a7bb8bbc2eeb31eb1732c99ec0fb743
Hall Liu [Wed, 28 Jun 2017 20:44:48 +0000 (20:44 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am:
c2f33f18eb
am:
761bad1c53
Change-Id: I7625defdce4fb4c69355f45d801729828646e659
Hall Liu [Wed, 28 Jun 2017 20:43:45 +0000 (20:43 +0000)]
Add download request tokens and enforce destination clear am:
2043f70acb
am:
8763c625a3
Change-Id: I6704e20ad1182fc8f97bd36700c54c3d2329da28
Alison Cichowlas [Wed, 28 Jun 2017 20:42:09 +0000 (16:42 -0400)]
This import got lost in the merge. Restore to fix build.
Test: built
Change-Id: Iba7e4449ed8ddfb535a45f087e3baf43b52a5f08
Brad Ebinger [Tue, 27 Jun 2017 17:08:55 +0000 (17:08 +0000)]
IMS: Check for binderstate before calling endSession
ImsRegistrationListenerProxy listener, which is registered
as part of ImsManager.open, is not cleared even after moving
feature state to NOT_AVAILABLE because end session
is never called.
Check for binder state instead of feature state READY before
calling end session. End session will be triggered after
moving feature state to NOT_AVAILABLE.
Notify Ims state change only for the supported feature state
change to clients.
Test: Manual
Bug:
62816014
Merged-In: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
Change-Id: Idfb6dfad51cca574c2ae25e2029ef7bdfe9d725b
(cherry picked from commit
913e11fcdfc9cbd7fd3eee1c94d1cb3fced37da9)
Hall Liu [Wed, 28 Jun 2017 20:36:49 +0000 (20:36 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
am:
c2f33f18eb
Change-Id: I7c2b0b34ed56bc506ce6139fb39649aec8319e81
Hall Liu [Wed, 28 Jun 2017 20:35:54 +0000 (20:35 +0000)]
Add download request tokens and enforce destination clear
am:
2043f70acb
Change-Id: I91e61d8f15815efc9f4d08d71d01944c096dc05f
Hall Liu [Wed, 28 Jun 2017 20:26:15 +0000 (20:26 +0000)]
Merge changes from topics 'embms-cleanup-action', 'embms-download-token'
* changes:
Implement the cleanup action in MbmsDownloadReceiver
Add download request tokens and enforce destination clear
Alison Cichowlas [Wed, 28 Jun 2017 20:17:11 +0000 (20:17 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
am:
e5c09e42eb
Change-Id: I7924f3e138bdd26e47e6f1c0c7f2526abc0b52f5
Mady Mellor [Wed, 7 Jun 2017 21:53:58 +0000 (14:53 -0700)]
Adjustments to PIP position while flinging
Rather than using a scroller, find the actual edge intercept
based on the trajectory of the fling.
This is done by finding the two points it could intersect with
and checking which point is 'closer' (i.e. would be hit first
by the PIP).
Bias towards using the intersection with the top / bottom edge
if the PIP is being flung along the side it's currently on.
Also increases the maximum time for the fling.
Bug:
35358634
Test: manual - fling PIP around screen while in landscape
and portrait
Change-Id: I26e943a5ddbc726ab86bc11e4271d4db034f3d47
Alison Cichowlas [Wed, 28 Jun 2017 20:08:21 +0000 (20:08 +0000)]
Merge "Disable failing RoundedCornersTest" into oc-dr1-dev
Android Build Merger (Role) [Wed, 28 Jun 2017 20:04:10 +0000 (20:04 +0000)]
Merge "Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1 am:
6355cb7afa" into oc-dr1-dev-plus-aosp
Andrii Kulian [Wed, 28 Jun 2017 20:03:04 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1
am:
cd02bf1676
Change-Id: Ieb098ddfdfb5deeb8c505b96c010e1e4281b754c
Andrii Kulian [Wed, 28 Jun 2017 20:03:02 +0000 (20:03 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev am:
b0c5d67bf1
am:
6355cb7afa
Change-Id: Ic73a2d9b97901826e7697168238c932a1d70cf22
Andrii Kulian [Wed, 28 Jun 2017 19:56:48 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ib8d85b8c96ff2590669e39134623456a2004d008
Andrii Kulian [Wed, 28 Jun 2017 19:56:33 +0000 (19:56 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
am:
b0c5d67bf1
Change-Id: Ic2361cab5ee66552f7d1714cfca0cc320c02ed30
Andrii Kulian [Wed, 28 Jun 2017 19:50:27 +0000 (19:50 +0000)]
Merge "Restrict launching activities on virtual displays" into oc-dev
Alison Cichowlas [Wed, 28 Jun 2017 19:23:04 +0000 (19:23 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
am:
22f0dfcff5
Change-Id: I8a0cad0e372b39ce237e9ff82f959e0d4b3f05dd
Alison Cichowlas [Wed, 28 Jun 2017 19:12:50 +0000 (19:12 +0000)]
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev
Alison Cichowlas [Wed, 28 Jun 2017 18:49:21 +0000 (14:49 -0400)]
Disable failing RoundedCornersTest
Bug:
63098063
Test: literally just test changes
Change-Id: Ibde220ccc049baa56f76c385543f97b241b4dc30
Lucas Dupin [Wed, 28 Jun 2017 18:42:00 +0000 (18:42 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
am:
b02863eba6
Change-Id: I81906c7fc634135f979316dd3c5d8d825bcf6c32
Jorim Jaggi [Wed, 28 Jun 2017 18:40:27 +0000 (14:40 -0400)]
Properly check for orientation mismatch
Previous check tested against the display, which is wrong. Now
we properly check against the configuration.
Test: go/wm-smoke
Test: Enter split screen, go home, launch app, go home, relaunch
app, ensure no splash screen shown
Test: Enter split screen with 2 apps, lock phone, unlock phone
Change-Id: I62d45b6d3e5aa91dcb5edffed4233a5fed7ac9aa
Fixes:
63075521
Lucas Dupin [Wed, 28 Jun 2017 18:34:28 +0000 (18:34 +0000)]
Merge changes from topic 'theme_overlay_sysui' into oc-dr1-dev
* changes:
Support dark text on Recents
Replaced overlay target package
Evan Laird [Wed, 28 Jun 2017 18:27:47 +0000 (14:27 -0400)]
Fix empty signal line thickness / color in status bar
Parameterize the line thickness to the height of the drawable. Also draw
the empty state as background signal instead of foreground.
Test: visual
Change-Id: I39a7ef3164b784008e3dba5284b7fe83e4666607
Fixes:
63097113
Mady Mellor [Wed, 28 Jun 2017 18:20:21 +0000 (18:20 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ded383d8b3
Change-Id: Id4ca0a39f39855133b384f87bb535dd1f01f5a93
Android Build Merger (Role) [Wed, 28 Jun 2017 18:17:38 +0000 (18:17 +0000)]
Merge "If the menu hasn't been created yet don't do things with it am:
104be2e019 am:
ef9a16202d" into oc-dr1-dev-plus-aosp
Mady Mellor [Wed, 28 Jun 2017 18:16:02 +0000 (18:16 +0000)]
If the menu hasn't been created yet don't do things with it am:
104be2e019
am:
ef9a16202d
Change-Id: I3f8bbe102215bf3c15f9cfa1556a2a51fc66449c
Jason Monk [Wed, 28 Jun 2017 18:15:27 +0000 (18:15 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
am:
082a4e254f
Change-Id: I82666e8068b7c660052004f438333bfd0ec3150a
Jason Monk [Wed, 28 Jun 2017 18:13:35 +0000 (18:13 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
am:
3ad6233685
Change-Id: I3d90b93e7dd896157dc1f645f3d8327bb0afd59a
John Reck [Wed, 28 Jun 2017 18:08:07 +0000 (11:08 -0700)]
Selectively disable filtering if estimated safe
If the output matches the source rect then use
GL_NEAREST instead of GL_FILTER. This is a more
pixel-exact capture.
Bug:
38242146
Test: CtsUiRendering & CtsViewTestCases:.PixelCopyTest passes on fugu
Change-Id: I9f57a4124374568f83d45fdc8f83cc767ded888a
Mady Mellor [Wed, 28 Jun 2017 18:10:07 +0000 (18:10 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I6bf4197736f6a6c6760ac091a2ca71402e44dec8
Mady Mellor [Wed, 28 Jun 2017 18:08:52 +0000 (18:08 +0000)]
If the menu hasn't been created yet don't do things with it
am:
104be2e019
Change-Id: I670206eb1da007b1eeea5f022124a352b0644b6a
Lei Yu [Wed, 28 Jun 2017 18:05:18 +0000 (18:05 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
am:
a023184bbc
Change-Id: Ibd5d41feaf18aacad79345404c944f365aa19587
Jason Monk [Wed, 28 Jun 2017 18:03:24 +0000 (18:03 +0000)]
Merge "Shrink the nav buttons some" into oc-dr1-dev
Jason Monk [Wed, 28 Jun 2017 18:01:17 +0000 (18:01 +0000)]
Merge "Enable "Reboot to safe mode" confirmation on GlobalActions" into oc-dr1-dev
Eugene Susla [Wed, 28 Jun 2017 17:58:46 +0000 (10:58 -0700)]
[Companion] Dont crash if started with bluetooth off
Bug:
63068644
Test: Turn BT off, and ensure the attached bud doesn't reproduce
Change-Id: I0de5ba6d28d7195dd3ebc7a3af36f057c762de60
Lei Yu [Wed, 28 Jun 2017 17:55:04 +0000 (17:55 +0000)]
Merge "Add API to RuntimePermissionPresenter" into oc-dr1-dev
Jeff Davidson [Wed, 28 Jun 2017 17:33:01 +0000 (17:33 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am:
f28843dd3f
Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429
Neil Fuller [Wed, 28 Jun 2017 17:28:11 +0000 (17:28 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a am:
4a7e3de5e7
am:
c1bf6505c8
Change-Id: I3342b515252fd5169a59b5b7d93d1d109036445c
Phil Weaver [Wed, 28 Jun 2017 16:46:32 +0000 (09:46 -0700)]
Don't break key event stream when enabling a11y
Bug:
62862624
Test: Enable magnification, then enable TalkBack with the
a11y shortcut. Verify that volume keys work.
A11y service CTS, a11y units tests.
Change-Id: I729ab17d24f758b5ce534ffde43d2126a1f9536c
Jeff Davidson [Wed, 28 Jun 2017 17:23:49 +0000 (17:23 +0000)]
Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
Neil Fuller [Wed, 28 Jun 2017 17:20:30 +0000 (17:20 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage" am:
4e77ae6d1a
am:
4a7e3de5e7
Change-Id: I5db1d32b6141653e7971c4f1dd9931d4042bb19b
Jason Monk [Wed, 28 Jun 2017 17:18:33 +0000 (13:18 -0400)]
NavBar: Don't reorient as much, its a waste of work
Test: runtest systemui
Change-Id: Iea9955fb48bc7f2a3da772af34109d972e11e7d7
Fixes:
62620242
Neil Fuller [Wed, 28 Jun 2017 17:13:35 +0000 (17:13 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
am:
4e77ae6d1a
Change-Id: Ib30177ef93ecacfbd6ab0fb98f933fbf8af0e270
Alison Cichowlas [Wed, 28 Jun 2017 14:58:05 +0000 (14:58 +0000)]
Revert "Hide power dialog when lockscreen comes and goes."
This reverts commit
0a2026430e789d5a7ddd837d6091b26bb190ac69.
Bug:
63092414,
37434614
Change-Id: I6b3e190b5107e0516ade0c93b586dfbdde00c9c1
Andrii Kulian [Wed, 28 Jun 2017 16:42:48 +0000 (09:42 -0700)]
Restrict launching activities on virtual displays
If an app creates a Surface and a virtual display backed by that
Surface, it can then launch activities and hijack their content.
This CL restrict activities that can be launched to virtual displays
created by apps only to those who set "allowEmbedded" attribute.
If a virtual display was created by system, apps won't get access to
the surface, so we're not limiting in this case.
Bug:
63094482
Test: android.server.cts.ActivityManagerDisplayTests
Test: #testLaunchNotEmbeddedOnVirtualDisplay
Change-Id: Ied216bdf33df4b5a6cc8cac0e006a4883a36f94f
Neil Fuller [Wed, 28 Jun 2017 17:01:56 +0000 (17:01 +0000)]
Merge "Switch PackageStatusStorage to XML-based storage"
Ying Xu [Wed, 28 Jun 2017 16:54:19 +0000 (16:54 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
am:
e5ad3821e3
Change-Id: Ia847e54c387fc145b36313048860aa6b281d4c56
Ying Xu [Wed, 28 Jun 2017 16:47:50 +0000 (16:47 +0000)]
Merge "Use Bundle for inter-process message" into oc-dr1-dev
Mady Mellor [Wed, 21 Jun 2017 00:18:53 +0000 (17:18 -0700)]
If the menu hasn't been created yet don't do things with it
Test: runtest systemui
Fixes:
62594598
Change-Id: I1050e2b2bf1ece960d19ad13cb6a9bf71512db57
(cherry picked from commit
0b3f004acbb0eef38ee5e8d920e934f7ab2f7cde)
Shunta Sato [Fri, 14 Apr 2017 07:01:54 +0000 (16:01 +0900)]
Enable "Reboot to safe mode" confirmation on GlobalActions
Android N or prior GlobalActions showed "Reboot to safe mode",
when user do long-press of "power off" button on GlobalActions.
Currently, no confirmation dialog is shown. It's not user friendly.
This commit make it enable again.
- Also dismiss global actions on long press.
Test: manual
Bug:
37333890
Change-Id: I3bfefff3cd34ba35b003281e94a4181cebb74fcf
Adrian Roos [Wed, 28 Jun 2017 15:31:56 +0000 (15:31 +0000)]
Merge "AOD: Proximity check doze triggers" into oc-dr1-dev
am:
939171ee8b
Change-Id: Id9694514f9f48f659d7df56f05c5e4492a30de2b
Android Build Merger (Role) [Wed, 28 Jun 2017 15:29:37 +0000 (15:29 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours am:
8a6ee58aa0 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Wed, 28 Jun 2017 15:28:49 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours
am:
8a6ee58aa0 -s ours
Change-Id: Ib7fab968af53d8cc0986ee18f1e0a7cd6c27dde2
Bill Yi [Wed, 28 Jun 2017 15:28:14 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f36a995424 -s ours
am:
270ef883af -s ours
Change-Id: I8b5f947a09796fdc59cc170b894ba48c844faef3