Adrian Roos
a6d97163d6
Merge "Keyguard: fix possible divergent state" into pi-dev
...
am: 5d8dfe17c8
2018-04-25 08:42:45 -07:00
TreeHugger Robot
5d8dfe17c8
Merge "Keyguard: fix possible divergent state" into pi-dev
2018-04-25 15:29:07 +00:00
Fan Zhang
72e8d917d2
Merge "Move brightness color conversion from SysUI to settingslib" into pi-dev
...
am: 04d504be03
2018-04-25 08:19:17 -07:00
TreeHugger Robot
04d504be03
Merge "Move brightness color conversion from SysUI to settingslib" into pi-dev
2018-04-25 15:07:31 +00:00
Chavi Weingarten
7e82751bdd
Merge "Synchronize RootWindowContainerTests" into pi-dev
...
am: 628e9b3d37
2018-04-25 07:55:06 -07:00
Chavi Weingarten
628e9b3d37
Merge "Synchronize RootWindowContainerTests" into pi-dev
2018-04-25 14:44:17 +00:00
Jorim Jaggi
99297b61c6
Merge "Potentially fix notification launch animation" into pi-dev
...
am: 8f699919ce
2018-04-25 07:34:14 -07:00
David Brazdil
b823d8f902
Merge "Add new hidden APIs" into pi-dev
...
am: eb0e982228
2018-04-25 07:29:04 -07:00
Jorim Jaggi
8f699919ce
Merge "Potentially fix notification launch animation" into pi-dev
2018-04-25 14:17:45 +00:00
David Brazdil
eb0e982228
Merge "Add new hidden APIs" into pi-dev
2018-04-25 13:59:20 +00:00
Mathew Inwood
9605012d56
Merge "Add more light greylist entries." into pi-dev
...
am: 72b1a7ecb9
2018-04-25 06:56:06 -07:00
Mathew Inwood
72b1a7ecb9
Merge "Add more light greylist entries." into pi-dev
2018-04-25 13:41:44 +00:00
Wale Ogunwale
8176fa9b23
Merge "Added OWNERS file to am package." into pi-dev
...
am: c907be6fd5
2018-04-25 06:30:49 -07:00
Wale Ogunwale
c907be6fd5
Merge "Added OWNERS file to am package." into pi-dev
2018-04-25 13:15:07 +00:00
David Brazdil
768a9530e0
Add new hidden APIs
...
Bug: 78552452
Test: make
Change-Id: I73dc97a33b645f6cd9b7bf4a37254737ed3107ce
2018-04-25 13:39:27 +01:00
Adrian Roos
6ec76b7288
Keyguard: fix possible divergent state
...
Fixes an issue where the state in SystemUI and AM/WM could
get out of sync: If the keyguardGoingAway transition is
started and then later canceled by SystemUI, it never
tells AM that it canceled it.
This causes SystemUI to show itself in keyguard mode,
meanwhile AM/WM do not hide the underlying app because
the status bar is in the going away transition as far
as it is concerned.
Change-Id: I5966f0655fd694ae599a83dda7a9f6463088632b
Fixes: 76367931
Test: delay keyguard going away callback, unlock phone, during the delay, remove SIM; verify it does not end up in bad state
2018-04-25 14:01:11 +02:00
Nicolas Geoffray
f1f1c56baf
Merge "New light grey APIs." into pi-dev
...
am: 36c643ed4f
2018-04-25 03:07:52 -07:00
Nicolas Geoffray
5e67063bb2
Merge "More light grey APIs." into pi-dev
...
am: 3d33656347
2018-04-25 03:03:21 -07:00
Nicolas Geoffray
03cafff5fd
Merge "Add more light grey APIs." into pi-dev
...
am: be8638307f
2018-04-25 02:56:31 -07:00
TreeHugger Robot
36c643ed4f
Merge "New light grey APIs." into pi-dev
2018-04-25 09:54:06 +00:00
TreeHugger Robot
3d33656347
Merge "More light grey APIs." into pi-dev
2018-04-25 09:51:04 +00:00
TreeHugger Robot
be8638307f
Merge "Add more light grey APIs." into pi-dev
2018-04-25 09:41:41 +00:00
Eran Messeri
4ac95fbe91
Merge "Remove unnecessary WTFs from password state check" into pi-dev
...
am: 24ba8398fe
2018-04-25 02:39:53 -07:00
Eran Messeri
24ba8398fe
Merge "Remove unnecessary WTFs from password state check" into pi-dev
2018-04-25 09:28:15 +00:00
Nicolas Geoffray
cf5837c370
Add more light grey APIs.
...
bug: 64382372
Test: m
Change-Id: Ib15b65c376e4038232d4c1e04d10e508b34786af
2018-04-25 09:27:37 +01:00
Nicolas Geoffray
1c1053b028
More light grey APIs.
...
bug: 78436346
Test: m
Change-Id: I8bff5332abc93d49170c77fabb589bbcfa9249b6
2018-04-25 09:26:03 +01:00
Nicolas Geoffray
e278dc0333
New light grey APIs.
...
bug: 78471731
Test: m
Change-Id: I52f34f735873de485a73169f1ebbffe9484d0fb7
2018-04-25 09:16:31 +01:00
Yu-Han Yang
87bbfe0529
Merge "Refactor GnssGeofenceProvider" into pi-dev
...
am: 728cb519a5
2018-04-24 21:07:52 -07:00
Yu-Han Yang
728cb519a5
Merge "Refactor GnssGeofenceProvider" into pi-dev
2018-04-25 03:55:08 +00:00
Joshua Brown
ac4f6a9bc0
Merge "Extract interface for the TemperatureView" into pi-dev
...
am: db7bb0bcef
2018-04-24 20:49:39 -07:00
TreeHugger Robot
db7bb0bcef
Merge "Extract interface for the TemperatureView" into pi-dev
2018-04-25 03:37:46 +00:00
Jack Yu
630be57f44
Merge "Fixed the document of getNetworkCountryIso" am: 8252157aca
...
am: 7f97be01f5
2018-04-24 17:43:18 -07:00
Jack Yu
7f97be01f5
Merge "Fixed the document of getNetworkCountryIso"
...
am: 8252157aca
2018-04-24 17:31:23 -07:00
Wale Ogunwale
641b116aab
Added OWNERS file to am package.
...
Why? Because I don't want to worry about things like ag/3760423
Test: N/A
Bug: 0
Change-Id: I96c38d8dfbb8ac5d530251de90acc8499f851075
2018-04-25 00:24:30 +00:00
Shuo Qian
2413d7e6f8
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
...
am: c4c7c19b67
2018-04-24 17:12:10 -07:00
Shuo Qian
c4c7c19b67
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
2018-04-24 23:54:10 +00:00
Robert Greenwalt
cbfa614f60
Revert "Revert "Remove the OEM hook implementation and usage""
...
This reverts commit 7cfc5cda2f
2018-04-24 23:48:26 +00:00
Brad Stenning
91d15b83c3
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
...
am: bdf8770ae3
2018-04-24 16:16:12 -07:00
Treehugger Robot
8252157aca
Merge "Fixed the document of getNetworkCountryIso"
2018-04-24 23:02:38 +00:00
TreeHugger Robot
bdf8770ae3
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
2018-04-24 23:01:43 +00:00
Rob Carr
59595cdc53
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
...
am: 6b683ecf6e
2018-04-24 15:42:46 -07:00
chaviw
0dc5880ab7
Synchronize RootWindowContainerTests
...
There were a few failures that seem to be threading issues.
Specifically, IndexOutOfBounds within a for loop that was iterating the
size of the ArrayList and ArrayMap index failure. RootWindowContainerTests
calls into methods in WM that assume the WM lock is already held. Ensure
testSetDisplayOverrideConfigurationIfNeeded is synchronized.
Test: RootWindowContainerTests#testSetDisplayOverrideConfigurationIfNeeded
Change-Id: I5003fc4a59baae4990a1464dbbc85b0938312994
Fixes: 78349285
2018-04-24 15:39:32 -07:00
Rob Carr
6b683ecf6e
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
2018-04-24 22:32:14 +00:00
Winson Chung
bc512694b1
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
...
am: 4187c1d9d0
2018-04-24 14:47:40 -07:00
Lorenzo Colitti
dc86aaa112
Merge "Actually @hide unwanted capability methods." into pi-dev
...
am: a09c06a6c1
2018-04-24 14:43:06 -07:00
Wale Ogunwale
e62499effd
Merge "Added OWNERS file for wm package." into pi-dev
...
am: fe36369c07
2018-04-24 14:33:32 -07:00
Winson Chung
4187c1d9d0
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
2018-04-24 21:21:26 +00:00
Lorenzo Colitti
a09c06a6c1
Merge "Actually @hide unwanted capability methods." into pi-dev
2018-04-24 21:20:25 +00:00
TreeHugger Robot
fe36369c07
Merge "Added OWNERS file for wm package." into pi-dev
2018-04-24 21:03:57 +00:00
Leon Scroggins
8bed8e4640
Merge "Attach color space after performing a readback" into pi-dev
...
am: 5bb709c31e
2018-04-24 13:27:10 -07:00
