OSDN Git Service
Dianne Hackborn [Thu, 10 Nov 2016 20:14:09 +0000 (20:14 +0000)]
Merge "Start implementing background restrictions for eph apps."
Dianne Hackborn [Wed, 9 Nov 2016 23:07:23 +0000 (15:07 -0800)]
Start implementing background restrictions for eph apps.
This implements the additional intended path for checking
allowed background operations, APP_START_MODE_DISABLED, which
doesn't allow an app to launch in the background at all.
Also change the semantics of delivering broadcasts to manifest
receivers to always restrict those, not changing based on
whether the app is currently idle. This is the desired intended
behavior for apps as they explicitly update to work with
bg check.
And now that we have ephemerality associated with the uid state
in the activity manager, we can propagate this through the
relevant callbacks in IUidObserver so things watching these
changes can immediately determine whether they should do their
more aggressive shut down work for the uid rather than having
to walk through all their state looking for package associated
with that uid and whether they should be shut down.
Also remove the "lenient" bg check mode, since that was
just an early experiment that we won't actually use.
Add a new "make-idle" activity manager command to immediately
put a uid into the idle state (if possible) to make it easier
to test.
Test: manually against an eph app
Change-Id: I43a138ff281f69a9251d3f29ab6e13f48cff8ad6
Andreas Huber [Thu, 10 Nov 2016 19:33:38 +0000 (19:33 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2 am:
fbb980e57b am:
fdaf348734
am:
90efd7bbb2
Change-Id: I66c2b632511ad5b6d2ce971ef4640e6c95c7c7b7
Andreas Huber [Thu, 10 Nov 2016 19:27:07 +0000 (19:27 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2 am:
fbb980e57b
am:
fdaf348734
Change-Id: Icc30767adea1ce61fe3bd87b395268db674ce021
Andreas Huber [Thu, 10 Nov 2016 19:14:30 +0000 (19:14 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections." am:
df3d68c9b2
am:
fbb980e57b
Change-Id: I7b80bbe5eed3066edfe26d83dd322114d2e4a961
Andreas Huber [Thu, 10 Nov 2016 19:08:28 +0000 (19:08 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
am:
df3d68c9b2
Change-Id: I56e293d16dee7503f717f3cca4902720307a2024
Chris Elliott [Thu, 10 Nov 2016 19:03:16 +0000 (19:03 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours am:
8409d50122 -s ours am:
c07d8aa52d -s ours am:
e2dd105af2 -s ours
am:
d3dd8e99fa -s ours
Change-Id: I391dabf19257106be0464ad2fbae86ae464da7e0
Hugo Benichi [Thu, 10 Nov 2016 19:02:03 +0000 (19:02 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours am:
986c684fb0 -s ours am:
5c10f1e552 -s ours am:
8fe310892b -s ours
am:
01d86c0902 -s ours
Change-Id: I2f2216c438756b0655d9183a98cee21cc642ec17
Treehugger Robot [Thu, 10 Nov 2016 18:58:28 +0000 (18:58 +0000)]
Merge "Fix use of JNI calls inside GetStringCritical/ReleaseStringCritical sections."
Chris Elliott [Thu, 10 Nov 2016 18:57:02 +0000 (18:57 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours am:
8409d50122 -s ours am:
c07d8aa52d -s ours
am:
e2dd105af2 -s ours
Change-Id: Iab445b20d02e9a501d74f27a59da5047957efc13
Hugo Benichi [Thu, 10 Nov 2016 18:55:34 +0000 (18:55 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours am:
986c684fb0 -s ours am:
5c10f1e552 -s ours
am:
8fe310892b -s ours
Change-Id: I63236413fa5272bbfb8c4fba83879089007694bc
Chris Elliott [Thu, 10 Nov 2016 18:50:28 +0000 (18:50 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours am:
8409d50122 -s ours
am:
c07d8aa52d -s ours
Change-Id: If5a7680ee9de27107bf32138e91f2eb705181ab0
Hugo Benichi [Thu, 10 Nov 2016 18:49:18 +0000 (18:49 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours am:
986c684fb0 -s ours
am:
5c10f1e552 -s ours
Change-Id: I9bf86e8adf3a2d6efbce54e3fc6a59ee650daaef
Chris Elliott [Thu, 10 Nov 2016 18:44:06 +0000 (18:44 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours am:
a8a116b001 -s ours
am:
8409d50122 -s ours
Change-Id: I31d22a167ee7de857ed0403b2d14daa1d90055f0
Hugo Benichi [Thu, 10 Nov 2016 18:42:57 +0000 (18:42 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours am:
37779485b7 -s ours
am:
986c684fb0 -s ours
Change-Id: I5bb53669285c0878905f8a2a70ff2dbe06c09ab2
Chris Elliott [Thu, 10 Nov 2016 18:37:44 +0000 (18:37 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours am:
69246f0565 -s ours
am:
a8a116b001 -s ours
Change-Id: I02d089dca4dd0ee9808f77dce0957b1cfaf6c87d
Hugo Benichi [Thu, 10 Nov 2016 18:36:30 +0000 (18:36 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours am:
69d565b12d -s ours
am:
37779485b7 -s ours
Change-Id: I42aabc35fa30e242125015eac1b7d32790cc4528
Chris Elliott [Thu, 10 Nov 2016 18:25:11 +0000 (18:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours
am:
69246f0565 -s ours
Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e
Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours
am:
69d565b12d -s ours
Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2
Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours
am:
0e11e0d961 -s ours
Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2
Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours
am:
da695f5fdb -s ours
Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360
Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am:
06a55fb553 -s ours
Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1
Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am:
f88508bd3e -s ours
Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533
Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
Randy Pan [Thu, 10 Nov 2016 16:46:02 +0000 (16:46 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c am:
33600a3d38 am:
e929425a9e
am:
6332104fbc
Change-Id: I10ae42879d7a4c7001583bfac2f835264c90ff2e
Randy Pan [Thu, 10 Nov 2016 16:32:56 +0000 (16:32 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c am:
33600a3d38
am:
e929425a9e
Change-Id: Ia38e00d785c56c295007aa19f3fe1e70d6a8b494
Randy Pan [Thu, 10 Nov 2016 16:26:23 +0000 (16:26 +0000)]
Merge "Wifi Tx/Rx rate computation" am:
bccf93311c
am:
33600a3d38
Change-Id: I766decd0d68c9a2cb47d374c9a48c8eac59a6a67
Randy Pan [Thu, 10 Nov 2016 16:15:52 +0000 (16:15 +0000)]
Merge "Wifi Tx/Rx rate computation"
am:
bccf93311c
Change-Id: I8b564af08155dcb49cf5f71d283b21091b80d3e0
Randy Pan [Thu, 10 Nov 2016 16:02:58 +0000 (16:02 +0000)]
Merge "Wifi Tx/Rx rate computation"
Manu Cornet [Thu, 10 Nov 2016 15:20:55 +0000 (15:20 +0000)]
Merge "2-D recents: fix toggling behavior and orientation changes."
Bill Yi [Thu, 10 Nov 2016 14:51:59 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e231af6c88 -s ours am:
0006905319 -s ours
am:
35e837a2f5 -s ours
Change-Id: I1b90aa4d6ed49964237f93274b5be6e91ddb217f
Bill Yi [Thu, 10 Nov 2016 14:50:57 +0000 (14:50 +0000)]
Import translations. DO NOT MERGE am:
377d4af0d0 -s ours am:
9d6ff72884 -s ours
am:
96fba02eea -s ours
Change-Id: I22dd965ff4382972860a30f9435a0b1d8f296379
Bill Yi [Thu, 10 Nov 2016 14:49:51 +0000 (14:49 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0bf8ae56ff -s ours am:
221c05e6d1 -s ours
am:
f9c19c2022 -s ours
Change-Id: I34bf096bd09cc4dfc463e00c70791392da17f6fc
Bill Yi [Thu, 10 Nov 2016 14:48:47 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE am:
37fa5cbc28 -s ours am:
35b2ed41ce -s ours
am:
dca4571f89 -s ours
Change-Id: I00c6e2ac628975709220a4ab5c43dcc9f343568b
Bill Yi [Thu, 10 Nov 2016 14:43:49 +0000 (14:43 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
e231af6c88 -s ours
am:
0006905319 -s ours
Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829
Bill Yi [Thu, 10 Nov 2016 14:42:49 +0000 (14:42 +0000)]
Import translations. DO NOT MERGE am:
377d4af0d0 -s ours
am:
9d6ff72884 -s ours
Change-Id: I89064de048418230fb51e09ceb3d6bfd631101c1
Bill Yi [Thu, 10 Nov 2016 14:41:42 +0000 (14:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
0bf8ae56ff -s ours
am:
221c05e6d1 -s ours
Change-Id: I15d5908cbf02847651321cea840c10666aa1c245
Bill Yi [Thu, 10 Nov 2016 14:37:50 +0000 (14:37 +0000)]
Import translations. DO NOT MERGE am:
37fa5cbc28 -s ours
am:
35b2ed41ce -s ours
Change-Id: Ibc2fa8caa377cdf5433842929549359ce8e4b71b
Bill Yi [Thu, 10 Nov 2016 14:25:20 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
e231af6c88 -s ours
Change-Id: I85b530c1946c4d2da5a4fefb6b343edb75b57697
Bill Yi [Thu, 10 Nov 2016 14:25:17 +0000 (14:25 +0000)]
Import translations. DO NOT MERGE
am:
377d4af0d0 -s ours
Change-Id: Ia88f3c49ca604ef7493bf493ca63becc0a20eb53
Bill Yi [Thu, 10 Nov 2016 14:23:45 +0000 (14:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
0bf8ae56ff -s ours
Change-Id: I896a62c6c88343eeba13406ce3ce71e576899762
Bill Yi [Thu, 10 Nov 2016 14:23:42 +0000 (14:23 +0000)]
Import translations. DO NOT MERGE
am:
37fa5cbc28 -s ours
Change-Id: I07c9584f08f6609f55a0af74fc5259f90fdb3285
Bill Yi [Thu, 10 Nov 2016 14:14:39 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 10 Nov 2016 14:13:43 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Narayan Kamath [Thu, 10 Nov 2016 11:00:38 +0000 (11:00 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7 am:
f0a65b9a98 am:
532d73cf8c
am:
78583ed6cb
Change-Id: Iec6ccdc441ec071a26ca73fbcb2c37c1f9004bff
Narayan Kamath [Thu, 10 Nov 2016 10:59:29 +0000 (10:59 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651 am:
b0c09c0ebe am:
847d4476a7
am:
2b1580360c -s ours
Change-Id: I2bbb08da6a456db4ce90d36138c255c6627d2292
Narayan Kamath [Thu, 10 Nov 2016 10:41:46 +0000 (10:41 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7 am:
f0a65b9a98
am:
532d73cf8c
Change-Id: Id48f0410d3068bb4411d86841bbd476ff612848a
Narayan Kamath [Thu, 10 Nov 2016 10:40:31 +0000 (10:40 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651 am:
b0c09c0ebe
am:
847d4476a7
Change-Id: I818bc8e1cb3f67fec10edefa527efcdef100f211
Narayan Kamath [Thu, 10 Nov 2016 10:35:03 +0000 (10:35 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc am:
e9a12d0ac7
am:
f0a65b9a98
Change-Id: I0d5469927688fa23290f3b3e136ba50820b0b8d9
Narayan Kamath [Thu, 10 Nov 2016 10:33:57 +0000 (10:33 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7 am:
c82eb23651
am:
b0c09c0ebe
Change-Id: I1c378d684eb07cd20b64b358770fa6fe1dae274c
Narayan Kamath [Thu, 10 Nov 2016 10:29:02 +0000 (10:29 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92 am:
c0df29dfbc
am:
e9a12d0ac7
Change-Id: I9c34dfaf3e2cdbb2560765002926a493d2651708
Narayan Kamath [Thu, 10 Nov 2016 10:27:58 +0000 (10:27 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e am:
720fcbc1f7
am:
c82eb23651
Change-Id: Iec1e60c29bcaedf030da989aa66488bd87206563
Bill Yi [Thu, 10 Nov 2016 10:24:31 +0000 (02:24 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I7d27891f4b452f54e6f14d22f37b6b2bcbdefc5b
Narayan Kamath [Thu, 10 Nov 2016 10:23:00 +0000 (10:23 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev am:
a67112ca92
am:
c0df29dfbc
Change-Id: I5a77286ff7758d3c7aaa1a2bd14588e8dd5216d5
Narayan Kamath [Thu, 10 Nov 2016 10:21:57 +0000 (10:21 +0000)]
Zygote : Block SIGCHLD during fork. am:
dfcc79ee8e
am:
720fcbc1f7
Change-Id: I18aeb47e1a4f061d5afe55a2aa936ae1d1cc61ff
Narayan Kamath [Thu, 10 Nov 2016 10:15:59 +0000 (10:15 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am:
a67112ca92
Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
Narayan Kamath [Thu, 10 Nov 2016 10:15:56 +0000 (10:15 +0000)]
Zygote : Block SIGCHLD during fork.
am:
dfcc79ee8e
Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
Bill Yi [Thu, 10 Nov 2016 10:13:53 +0000 (02:13 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
32766034
Change-Id: I3116c8192dcb7e203d6551eaa50e6faf4220cd0e
Narayan Kamath [Thu, 10 Nov 2016 10:04:09 +0000 (10:04 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
Lorenzo Colitti [Thu, 10 Nov 2016 08:37:55 +0000 (08:37 +0000)]
Merge "Unbreak TetherInterfaceStateMachineTest."
TreeHugger Robot [Thu, 10 Nov 2016 08:26:54 +0000 (08:26 +0000)]
Merge changes I93b8ed74,I43decfee
* changes:
Update callbacks when initializing to initial state
UI Keyguard fixes
Jorim Jaggi [Tue, 8 Nov 2016 00:48:31 +0000 (16:48 -0800)]
Update callbacks when initializing to initial state
This fixes a bug where activity manager was not informed about the
lockscreen state if Keyguard was disabled and SystemUI crashed, so
we just displayed a black screen.
Test:
- Set no lockscreen
- Crash SystemUI
Change-Id: I93b8ed74dd12af6903ffdb05b59c78f2f12febb4
Jorim Jaggi [Thu, 3 Nov 2016 04:57:33 +0000 (21:57 -0700)]
UI Keyguard fixes
- Streamline the various keyguardDone paths. The keyguard will be
dismissed if and only if both the hide animation has run and the
Keyguard is ready for dismissal. This fixes a bug in which the
hide animation was not run.
- When we get an external dismiss call, make sure to collapse the
panel as well.
- When we execute an action and Keyguard is occluded, we execute
if after the Keyguard is gone so there are no weird transition
because Keyguard might get unoccluded.
Test: Manual for the above flows.
Bug:
30961403
Bug:
27422134
Change-Id: I43decfeec270c4ed628bd9479109150c57201dae
TreeHugger Robot [Thu, 10 Nov 2016 04:56:54 +0000 (04:56 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 10 Nov 2016 04:56:03 +0000 (04:56 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 10 Nov 2016 04:17:58 +0000 (04:17 +0000)]
Merge "Catch a missed case when adding a toast"
Hugo Benichi [Tue, 19 Jul 2016 06:59:27 +0000 (15:59 +0900)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.
Bug:
24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
Alain Vongsouvanh [Thu, 10 Nov 2016 02:53:03 +0000 (02:53 +0000)]
colors: Properly set the default accent colors. am:
7b371575e4 am:
e616fa1789
am:
f7f79980ee
Change-Id: I74a5f5dbcf1d6503971f857829b8aea3dea97529
Alain Vongsouvanh [Thu, 10 Nov 2016 02:47:29 +0000 (02:47 +0000)]
colors: Properly set the default accent colors. am:
7b371575e4
am:
e616fa1789
Change-Id: I111e3491c067fe286608c5df73f9d5da90373570
Svetoslav Ganov [Tue, 18 Oct 2016 20:29:27 +0000 (13:29 -0700)]
Catch a missed case when adding a toast
We allow a single toast window per UID. It is possible that
the UID had another toast window that is going away and this
CL adds a catch all check as there was a case missing.
Change-Id: I4c68e7212a05ce349e6e5b1cffe6e36d429aaca0
Alain Vongsouvanh [Thu, 10 Nov 2016 02:40:55 +0000 (02:40 +0000)]
colors: Properly set the default accent colors.
am:
7b371575e4
Change-Id: Icff01bd37726c9a77a80f1afb501390bb3ddc629
TreeHugger Robot [Thu, 10 Nov 2016 02:14:12 +0000 (02:14 +0000)]
Merge "Traverse window hierarchy without window list"
Alain Vongsouvanh [Wed, 9 Nov 2016 22:52:37 +0000 (14:52 -0800)]
colors: Properly set the default accent colors.
The 700 and 50 variant of the default accent colors were pointing to the
wrong material resources (deep_teal instead of accent).
This CL also update the watch colors to the proper specs.
BUG:
32087183
Change-Id: Ib8a23d9078e79bc0fdf6da893b4dff12954c2cbb
TreeHugger Robot [Thu, 10 Nov 2016 00:54:51 +0000 (00:54 +0000)]
Merge "The big Keyguard transition refactor (8/n)"
TreeHugger Robot [Thu, 10 Nov 2016 00:02:12 +0000 (00:02 +0000)]
Merge "Add event logging for UserState transitions."
Wale Ogunwale [Fri, 4 Nov 2016 16:51:54 +0000 (09:51 -0700)]
Traverse window hierarchy without window list
Added support for to get all windows in the hierarchy without needing
to use WindowList concept which is a very complicated implementation
in the code base.
This implementation walks the hierarchy node by node returns windows
in order to the caller using a callback.
Test: bit FrameworksServicesTests:com.android.server.wm.DisplayContentTests
Change-Id: I2719f7c96f26dad23f91c1c589be88712bd224b8
Jorim Jaggi [Tue, 1 Nov 2016 01:24:38 +0000 (18:24 -0700)]
The big Keyguard transition refactor (8/n)
Don't force mKeyguardGoingAway, as this never recovers. Make sure
to only show the dismissing Keyguard activtiy and recover the
state when trusted state changes.
Test: Make sure Keyguard is in a trusted state, start an activity
with FLAG_DISMISS_KEYGUARD from FLAG_SHOW_WHEN_LOCKED activity
and make sure there is no flicker.
Bug:
32057734
Change-Id: I5d212f6f9d5430250b22c8370f45dc95756432d2
Selim Cinek [Wed, 9 Nov 2016 23:26:07 +0000 (23:26 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev am:
6a6bc370e9
am:
aaa70f5d37
Change-Id: Ia3f4705c1a84f87629842fe13c9064b41ae4975c
Selim Cinek [Wed, 9 Nov 2016 23:24:50 +0000 (23:24 +0000)]
Fixed a bug with the emergency affordance in multi user am:
0294f9e39b
am:
00b6a1dded
Change-Id: I6e50a09eedb9acecab481d615e2d63c5508b1268
Selim Cinek [Wed, 9 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
am:
6a6bc370e9
Change-Id: Iae4342afea01390f6b2567832f863881907dacb0
Selim Cinek [Wed, 9 Nov 2016 23:19:19 +0000 (23:19 +0000)]
Fixed a bug with the emergency affordance in multi user
am:
0294f9e39b
Change-Id: Ib23d37b6ac5cc32aa77aa099c3fa2937ff3570d3
TreeHugger Robot [Wed, 9 Nov 2016 23:05:39 +0000 (23:05 +0000)]
Merge "Fixed a bug with the emergency affordance in multi user" into nyc-mr2-dev
Bill Yi [Wed, 9 Nov 2016 22:35:41 +0000 (14:35 -0800)]
Import translations. DO NOT MERGE
Change-Id: If0da996cf52bec08bb2b154664908c76bee507bd
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 9 Nov 2016 22:07:56 +0000 (22:07 +0000)]
Merge "Keyguard: Fix screenTurnedOn trace tag"
Bill Yi [Wed, 9 Nov 2016 22:01:42 +0000 (14:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I72312b850912a5c47a318ebb60f4545a0c00f5e9
Auto-generated-cl: translation import
Xin Li [Wed, 9 Nov 2016 21:37:49 +0000 (21:37 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f am:
0326b807fa am:
d478287ab9 am:
a29c7c77b1
am:
7bd6cdf057 -s ours
Change-Id: I62cc0c04b1bb35b2e1745e7eef44ba5f74a8fab4
Xin Li [Wed, 9 Nov 2016 21:36:34 +0000 (21:36 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520 am:
4c1922b441 am:
ba293f3c28 am:
a009932a57
am:
a732c69257 -s ours
Change-Id: Icbc86a35dd1b368e4796550be2280e08b17d5eb8
Xin Li [Wed, 9 Nov 2016 21:26:57 +0000 (21:26 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f am:
0326b807fa am:
d478287ab9
am:
a29c7c77b1
Change-Id: Id4428dfa09f0c0d24c045ce2ae2fb1abad3aaa15
Xin Li [Wed, 9 Nov 2016 21:25:42 +0000 (21:25 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520 am:
4c1922b441 am:
ba293f3c28
am:
a009932a57
Change-Id: I5cf1015e071c8a98d63fc318088746c9728f3795
Xin Li [Wed, 9 Nov 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours am:
4146229e69 am:
0bf282606f am:
0326b807fa
am:
d478287ab9
Change-Id: Ie236947ac81a8415e0c382daf4a6527337d3e78b
Xin Li [Wed, 9 Nov 2016 21:13:43 +0000 (21:13 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours am:
d167a27c1f am:
892385f520 am:
4c1922b441
am:
ba293f3c28
Change-Id: I5fda98c9f3c5f0c8abd133a960e32ef058c261c2
Android Build Merger (Role) [Wed, 9 Nov 2016 21:11:50 +0000 (21:11 +0000)]
Merge "Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e am:
dac1d242ab am:
2b3a352a4d am:
bec3a79a27"
Narayan Kamath [Wed, 9 Nov 2016 21:11:06 +0000 (21:11 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev am:
12f98789bf am:
acdb6bb1aa am:
e3d31ebc0e am:
dac1d242ab am:
2b3a352a4d
am:
bec3a79a27
Change-Id: I9973287f85c8f40a15e67ba4069c6904216342cb
Android Build Merger (Role) [Wed, 9 Nov 2016 21:10:42 +0000 (21:10 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours am:
30a6da2b14 am:
c8044be01e am:
efc25ed0e8"
Narayan Kamath [Wed, 9 Nov 2016 21:10:00 +0000 (21:10 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
25cd01cc69 am:
4f65baa12f am:
76a388b93b -s ours am:
30a6da2b14 am:
c8044be01e
am:
efc25ed0e8
Change-Id: I370a8b2690a59c682a0fe633f28fbf43d96293b2
Android Build Merger (Role) [Wed, 9 Nov 2016 21:09:37 +0000 (21:09 +0000)]
Merge "Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac am:
781d8f7426 am:
c8ac64aca7 am:
b7f279051e am:
d05a06d1e2 -s ours"
Xin Li [Wed, 9 Nov 2016 21:08:52 +0000 (21:08 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev am:
49b144e630 am:
1a06ebfcac am:
781d8f7426 am:
c8ac64aca7 am:
b7f279051e
am:
d05a06d1e2 -s ours
Change-Id: I0931d2e1abf4a28949ceec6c0d0838b4a94f488b
Android Build Merger (Role) [Wed, 9 Nov 2016 21:08:32 +0000 (21:08 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081 am:
9dccfbc7c8 am:
68d354abce am:
3b4f8bc034 am:
4679b5553e -s ours"
TreeHugger Robot [Wed, 9 Nov 2016 21:07:58 +0000 (21:07 +0000)]
Merge "Move dump() to dumpAsync(), more oneway calls."
Xin Li [Wed, 9 Nov 2016 21:07:38 +0000 (21:07 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev. am:
9b9906e9c0 -s ours am:
b9634f3081 am:
9dccfbc7c8 am:
68d354abce am:
3b4f8bc034
am:
4679b5553e -s ours
Change-Id: I54b9244a2cafba1c14290473e8b73fe52a2403c1