OSDN Git Service
Brad Stenning [Tue, 24 Apr 2018 23:31:04 +0000 (16:31 -0700)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev am:
bdf8770ae3
am:
91d15b83c3
Change-Id: Ib3cf2b1160111805c45f2211536a2f4edc5f5560
Brad Stenning [Tue, 24 Apr 2018 23:16:12 +0000 (16:16 -0700)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
am:
bdf8770ae3
Change-Id: If479ab643ce821eb698d4d25429f0132cd887bb2
TreeHugger Robot [Tue, 24 Apr 2018 23:01:43 +0000 (23:01 +0000)]
Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
Rob Carr [Tue, 24 Apr 2018 22:54:09 +0000 (15:54 -0700)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev am:
6b683ecf6e
am:
59595cdc53
Change-Id: I28e385ac6f1eea11d749aa52dfce1327717a1964
Rob Carr [Tue, 24 Apr 2018 22:42:46 +0000 (15:42 -0700)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
am:
6b683ecf6e
Change-Id: I3498de97f677e62050388e38462632475714e4a4
Rob Carr [Tue, 24 Apr 2018 22:32:14 +0000 (22:32 +0000)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
Winson Chung [Tue, 24 Apr 2018 21:56:45 +0000 (14:56 -0700)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev am:
4187c1d9d0
am:
bc512694b1
Change-Id: Ia5244ecc790d36c39460f66d894b608a7648c37a
Lorenzo Colitti [Tue, 24 Apr 2018 21:50:14 +0000 (14:50 -0700)]
Merge "Actually @hide unwanted capability methods." into pi-dev am:
a09c06a6c1
am:
dc86aaa112
Change-Id: I923e5377a1abe761217612452cbfdba752e53de2
Winson Chung [Tue, 24 Apr 2018 21:47:40 +0000 (14:47 -0700)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
am:
4187c1d9d0
Change-Id: I2b9a9cc997b80fb40388ca7d999ee1f2380d5fc6
Lorenzo Colitti [Tue, 24 Apr 2018 21:43:06 +0000 (14:43 -0700)]
Merge "Actually @hide unwanted capability methods." into pi-dev
am:
a09c06a6c1
Change-Id: I80a88123b16c54734306da7e5dc0670972041648
Wale Ogunwale [Tue, 24 Apr 2018 21:42:58 +0000 (14:42 -0700)]
Merge "Added OWNERS file for wm package." into pi-dev am:
fe36369c07
am:
e62499effd
Change-Id: I47eba931937b8ea3578e8cbdd505b61bf111c2f8
Wale Ogunwale [Tue, 24 Apr 2018 21:33:32 +0000 (14:33 -0700)]
Merge "Added OWNERS file for wm package." into pi-dev
am:
fe36369c07
Change-Id: I454f8f8c2f0c35bcd966aac98b2fcb4427a6cd23
Winson Chung [Tue, 24 Apr 2018 21:21:26 +0000 (21:21 +0000)]
Merge "Don't call into AM finish-recents-animation while holding onto the WM lock" into pi-dev
Lorenzo Colitti [Tue, 24 Apr 2018 21:20:25 +0000 (21:20 +0000)]
Merge "Actually @hide unwanted capability methods." into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 21:03:57 +0000 (21:03 +0000)]
Merge "Added OWNERS file for wm package." into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 20:53:29 +0000 (20:53 +0000)]
Merge "Updated ColorDrawable to implement getColorFilter"
Leon Scroggins [Tue, 24 Apr 2018 20:47:24 +0000 (13:47 -0700)]
Merge "Attach color space after performing a readback" into pi-dev am:
5bb709c31e
am:
8bed8e4640
Change-Id: I30163b35febc6d62d65071be32e68e77d5b6b051
Leon Scroggins III [Tue, 24 Apr 2018 20:42:36 +0000 (13:42 -0700)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev am:
eabeec49c4
am:
ac2454c905
Change-Id: Ia2693ba87ed07a79315282ed5ab7f6c89cb11c6e
Hansong Zhang [Tue, 24 Apr 2018 20:32:27 +0000 (13:32 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev am:
dc34eb6055
am:
a5c9aa3ecc
Change-Id: Ia7181241b8853f085d7e626337724473a28dddbc
Leon Scroggins [Tue, 24 Apr 2018 20:27:10 +0000 (13:27 -0700)]
Merge "Attach color space after performing a readback" into pi-dev
am:
5bb709c31e
Change-Id: Ia99aa64858049fbc31ba9fc9480f6feba96b20da
Ryan Mitchell [Tue, 24 Apr 2018 20:26:34 +0000 (13:26 -0700)]
Merge "RRO: Update target overlays after install" into pi-dev am:
5854a02719
am:
54be19da18
Change-Id: Ibc55da7be7e564ceda253e778f792edf15bad1b2
Leon Scroggins III [Tue, 24 Apr 2018 20:22:12 +0000 (13:22 -0700)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev
am:
eabeec49c4
Change-Id: I4c0f080bec08f3437c7c2c393a8213609f8ac623
Hansong Zhang [Tue, 24 Apr 2018 20:16:57 +0000 (13:16 -0700)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev
am:
dc34eb6055
Change-Id: Ia4f090d2f8b273f0cf7527791d043f9d3d1c373c
Jean-Michel Trivi [Tue, 24 Apr 2018 20:16:46 +0000 (13:16 -0700)]
AudioPlaybackConfiguration release/death: notify listeners am:
2a28126af9
am:
9c3d892059
Change-Id: I38b630f8622b3efc1c9b4e1cc5a7bd6ac71f9a30
Ryan Mitchell [Tue, 24 Apr 2018 20:11:22 +0000 (13:11 -0700)]
Merge "RRO: Update target overlays after install" into pi-dev
am:
5854a02719
Change-Id: I64ae21a1462007bf2e2d5d41fcecf9ffbc78819b
Chris Tate [Tue, 24 Apr 2018 20:03:30 +0000 (13:03 -0700)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev am:
ed9f3ef958
am:
13b550026b
Change-Id: Ic2a5a1df4c9b12c02a46fc3384bfa2dc863d60ac
Leon Scroggins [Tue, 24 Apr 2018 20:01:22 +0000 (20:01 +0000)]
Merge "Attach color space after performing a readback" into pi-dev
Jean-Michel Trivi [Tue, 24 Apr 2018 19:59:09 +0000 (12:59 -0700)]
AudioPlaybackConfiguration release/death: notify listeners
am:
2a28126af9
Change-Id: Id746122af3bc178f20d448e14afd81d8040fc507
TreeHugger Robot [Tue, 24 Apr 2018 19:58:53 +0000 (19:58 +0000)]
Merge "Fix rounding of padding in NinePatchDrawable" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 19:53:49 +0000 (19:53 +0000)]
Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" into pi-dev
Ryan Mitchell [Tue, 24 Apr 2018 19:53:33 +0000 (19:53 +0000)]
Merge "RRO: Update target overlays after install" into pi-dev
Chris Tate [Tue, 24 Apr 2018 19:51:29 +0000 (12:51 -0700)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev
am:
ed9f3ef958
Change-Id: I0ce9f93fc87a33114cf64c4aa9dff4e1ae325477
Wale Ogunwale [Tue, 24 Apr 2018 19:39:26 +0000 (12:39 -0700)]
Added OWNERS file for wm package.
Why? Because I don't want to worry about things like ag/
3760423
Test: N/A
Bug: 0
Change-Id: I230b7e8aead53395da5c58aa27ed547cf06fb327
Nader Jawad [Tue, 24 Apr 2018 00:13:06 +0000 (17:13 -0700)]
Updated ColorDrawable to implement getColorFilter
ColorDrawable previously did not implement getColorFilter despite having
a proper setColorFilter implementation. Updated ColorDrawable to support
getColorFilter returning the corresponding ColorFilter configured on
it's paint.
Change-Id: Iabc3cd1b9110f5c3ec25e26a31966e2a43f8fb16
Fixes:
78476471
Test: Re-ran CtsGraphicsTest
Jean-Michel Trivi [Tue, 24 Apr 2018 00:22:55 +0000 (17:22 -0700)]
AudioPlaybackConfiguration release/death: notify listeners
When a player dies or is released, dispatch an update to the
AudioPlaybackConfiguration listeners.
Bug:
70195346
Test: atest AudioPlaybackConfiguration#testCallbackMediaPlayerRelease
Change-Id: Id0b62abb32879d3166da26f20a334d0447183ac0
Chris Tate [Tue, 24 Apr 2018 19:25:23 +0000 (19:25 +0000)]
Merge "Don't automatically decline tracking jobs with met initial delays" into pi-dev
Brad Stenning [Sat, 14 Apr 2018 05:52:39 +0000 (22:52 -0700)]
Allow for the lock screen to have a different set of nav buttons
Bug:
74446022
Test: Manually. Test by switching users that have PINs set
Change-Id: Id956b0cfe76eba82235b82080c755489bdf67938
Fyodor Kupolov [Tue, 24 Apr 2018 18:15:06 +0000 (11:15 -0700)]
Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev am:
76372003a6
am:
6383238db3
Change-Id: Id63af26478864c86b7295e1b16911453f3aff1a9
Phil Weaver [Tue, 24 Apr 2018 18:05:26 +0000 (11:05 -0700)]
Merge "Move status bar accessibility title to pane" into pi-dev am:
853af140f9
am:
e4857b65f5
Change-Id: Ic7a39a2842e8e3b18f65870f28d7dbad2f53748b
Fyodor Kupolov [Tue, 24 Apr 2018 18:00:54 +0000 (11:00 -0700)]
Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev
am:
76372003a6
Change-Id: I00ce938b8815aa7e9a961577b946387f410a8445
Phil Weaver [Tue, 24 Apr 2018 17:50:51 +0000 (10:50 -0700)]
Merge "Move status bar accessibility title to pane" into pi-dev
am:
853af140f9
Change-Id: I5937d8017cf922b156f114af7653dfb5bbeeabc0
Fyodor Kupolov [Tue, 24 Apr 2018 17:37:31 +0000 (17:37 +0000)]
Merge "Use log.wtf on debug devices if property cannot be set" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 17:35:22 +0000 (17:35 +0000)]
Merge "Move status bar accessibility title to pane" into pi-dev
Roshan Pius [Tue, 24 Apr 2018 17:26:41 +0000 (10:26 -0700)]
Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev am:
cd8d257d42
am:
607a78db5f
Change-Id: I23137675eaa8176246d06faf28ef84d6cd15162a
Roshan Pius [Tue, 24 Apr 2018 17:18:03 +0000 (10:18 -0700)]
Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev
am:
cd8d257d42
Change-Id: Ic47ded2705c49ab4a956763d07d92f557a550455
Tyler Gunn [Tue, 24 Apr 2018 17:14:09 +0000 (10:14 -0700)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds." am:
a355552bfe am:
cc9acb51c5
am:
2e8b22cdbf
Change-Id: I3c2dd44ac20685951617889f0b9ad785d8046685
Winson Chung [Tue, 24 Apr 2018 17:07:13 +0000 (10:07 -0700)]
Merge "Fix NPE when deciding whether to defer task stack animation." into pi-dev am:
8faa90beeb
am:
94b669c616
Change-Id: I01ac013bdbe72a0da1eef0a097a56efaa608daa2
TreeHugger Robot [Tue, 24 Apr 2018 17:06:09 +0000 (17:06 +0000)]
Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev
Tyler Gunn [Tue, 24 Apr 2018 17:02:17 +0000 (10:02 -0700)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds." am:
a355552bfe
am:
cc9acb51c5
Change-Id: Ie6d937b3a6a09e358945a5453af43b6096d8d9b6
Mathew Inwood [Tue, 24 Apr 2018 16:57:28 +0000 (09:57 -0700)]
[automerger skipped] Merge "Add presubmit hook for hidden API lists." into pi-dev am:
02033386c2
am:
1b216d84c0 -s ours
Change-Id: I7fb5e2ec3553aa3a0ba7efd002058486518e0151
Winson Chung [Tue, 24 Apr 2018 16:53:14 +0000 (09:53 -0700)]
Merge "Fix NPE when deciding whether to defer task stack animation." into pi-dev
am:
8faa90beeb
Change-Id: I6550076e6dd6ccb60e8b2c6537660155d2f2fe4a
Tyler Gunn [Tue, 24 Apr 2018 16:52:26 +0000 (09:52 -0700)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
am:
a355552bfe
Change-Id: Id58f0268fd6e5a3611b2dc27d456b13fb8dcee6a
Mathew Inwood [Tue, 24 Apr 2018 16:47:36 +0000 (09:47 -0700)]
Merge "Add presubmit hook for hidden API lists." into pi-dev
am:
02033386c2
Change-Id: I6c437a6ffa62794f1fc88d0c8bcdcef798b68d8c
Ryan Mitchell [Fri, 20 Apr 2018 01:02:14 +0000 (18:02 -0700)]
RRO: Update target overlays after install
Newly installed apps were not having the their set of enabled overlays
set correctly. This allows all newly installed packages to update their
set of enabled overlays in the package manager.
Bug:
77279210
Bug:
65319218
Change-Id: I82a10e96e9869bb6fc1ad00305ec4b6cfb17483b
Test: Manual validation of b/
77279210 and duplicates. Also enabled a previously failing
PTS test in ag/
3941515 within the same topic.
Winson Chung [Tue, 24 Apr 2018 16:39:07 +0000 (16:39 +0000)]
Merge "Fix NPE when deciding whether to defer task stack animation." into pi-dev
Mathew Inwood [Tue, 24 Apr 2018 16:32:17 +0000 (16:32 +0000)]
Merge "Add presubmit hook for hidden API lists." into pi-dev
Andrew Hsieh [Tue, 24 Apr 2018 16:24:01 +0000 (09:24 -0700)]
Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev am:
d6afc52a9c
am:
4c161911a3
Change-Id: Ic15f43714d28afbd06d55afe779ff8eea06920c7
Andrew Hsieh [Tue, 24 Apr 2018 16:13:44 +0000 (09:13 -0700)]
Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev
am:
d6afc52a9c
Change-Id: I655c45bace10a69437cad9536f30b19c09692186
Andrew Hsieh [Tue, 24 Apr 2018 16:05:23 +0000 (16:05 +0000)]
Merge "pm: skip scan-as-privileged for OMR1 vendors" into pi-dev
Tyler Gunn [Tue, 24 Apr 2018 15:33:29 +0000 (15:33 +0000)]
Merge "Add ability to log last 2 digits of dialed numbers in userdebug builds."
Mathew Inwood [Tue, 24 Apr 2018 15:10:13 +0000 (15:10 +0000)]
Merge "Add presubmit hook for hidden API lists."
Mathew Inwood [Mon, 23 Apr 2018 15:13:14 +0000 (16:13 +0100)]
Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f
So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.
Also sort the existing lists accordingly.
Test: repo upload
Bug:
64382372
Merged-In: I52b884da33a9a46455df6747a215683d9d3c3218
Change-Id: I4cdd3bc5c11be91a9a3f678580af49ac67f3c968
Adrian Roos [Tue, 24 Apr 2018 14:13:25 +0000 (07:13 -0700)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev am:
fd935d3a12
am:
bbb49941a1
Change-Id: I0aa39501d5ca944204cb4afd83ff27b71ee6b199
David Brazdil [Tue, 24 Apr 2018 14:04:32 +0000 (07:04 -0700)]
[automerger skipped] Merge "Add more hidden APIs to light greylist" into pi-dev am:
6021921b94
am:
4720a41e0b -s ours
Change-Id: Id811b388ce4f858bb250e1c62c667e48fcac80d2
Mathew Inwood [Mon, 23 Apr 2018 15:13:14 +0000 (16:13 +0100)]
Add presubmit hook for hidden API lists.
Check that they're sorted as expected and contain no duplicates.
The sort order now uses:
$ LC_COLLATE=C sort -f
So that non-alphanumeric characters are not ignored, giving a more
intuitive sort order. the '-f' means ignore case.
Also sort the existing lists accordingly.
Test: repo upload
Bug:
64382372
Change-Id: I52b884da33a9a46455df6747a215683d9d3c3218
Adrian Roos [Tue, 24 Apr 2018 14:00:03 +0000 (07:00 -0700)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
am:
fd935d3a12
Change-Id: I94cb7eb84ce34554524339bc1ba7c64cb7b2e46a
Beverly [Tue, 24 Apr 2018 13:57:26 +0000 (06:57 -0700)]
Merge "Edit dnd icon in volume dialog" into pi-dev am:
57e77be49d
am:
278b8a9dd7
Change-Id: I220c2c191168452d83a65fe031d95f848e297ebe
David Brazdil [Tue, 24 Apr 2018 13:52:07 +0000 (06:52 -0700)]
Merge "Add more hidden APIs to light greylist" into pi-dev
am:
6021921b94
Change-Id: I5fdff2a1910cc960eb190642c19afd4f1e8ec538
Beverly [Tue, 24 Apr 2018 13:47:03 +0000 (06:47 -0700)]
Merge "Edit dnd icon in volume dialog" into pi-dev
am:
57e77be49d
Change-Id: Ie4698f1ceacf92eb4551ee0ca27b25696e6f1b6d
TreeHugger Robot [Tue, 24 Apr 2018 13:40:45 +0000 (13:40 +0000)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 13:34:10 +0000 (13:34 +0000)]
Merge "Add more hidden APIs to light greylist" into pi-dev
TreeHugger Robot [Tue, 24 Apr 2018 13:34:05 +0000 (13:34 +0000)]
Merge "Edit dnd icon in volume dialog" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 13:32:58 +0000 (06:32 -0700)]
Merge "Make password history hashing more secure" into pi-dev am:
66b6d1c3bc
am:
1e90f0135f
Change-Id: Ie67bb7caa2c1fec8c58d876171586ee88d16409f
TreeHugger Robot [Tue, 24 Apr 2018 13:22:34 +0000 (13:22 +0000)]
Merge "Check self permission in BackupManager#isBackupServiceActive"
Rubin Xu [Tue, 24 Apr 2018 13:22:16 +0000 (06:22 -0700)]
Merge "Make password history hashing more secure" into pi-dev
am:
66b6d1c3bc
Change-Id: Iae4f9ca93a193d24b23410c92659d35a50506b4b
TreeHugger Robot [Tue, 24 Apr 2018 13:06:57 +0000 (13:06 +0000)]
Merge "Make password history hashing more secure" into pi-dev
Rebecca Silberstein [Tue, 24 Apr 2018 13:06:26 +0000 (06:06 -0700)]
Merge "update wifi unit test script" into pi-dev am:
4a7913c268
am:
c5e42dc131
Change-Id: Ie107d7353a5eb83ef42d094bc8d615d0f49146d2
Rebecca Silberstein [Tue, 24 Apr 2018 12:58:08 +0000 (05:58 -0700)]
Merge "update wifi unit test script" into pi-dev
am:
4a7913c268
Change-Id: I1a55eed1317ab101837b24d3162d1218d19c6ef6
TreeHugger Robot [Tue, 24 Apr 2018 12:52:41 +0000 (12:52 +0000)]
Merge "Add list of approved services in addApprovedList"
TreeHugger Robot [Tue, 24 Apr 2018 12:45:34 +0000 (12:45 +0000)]
Merge "update wifi unit test script" into pi-dev
Bernardo Rufino [Tue, 24 Apr 2018 12:29:34 +0000 (05:29 -0700)]
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev am:
ad8159bea0
am:
e348c14524
Change-Id: Ic31eabf98521d0823b6329914809dcfd937e33fe
Adrian Roos [Tue, 24 Apr 2018 12:21:39 +0000 (14:21 +0200)]
Keyguard: Don't lock when phone process crashes
Fixed an issue where the keyguard locked in response to the
phone process crashing. Since that's not avoidable for the
moment, don't treat unknown sim states as absent.
Bug:
78060670
Test: adb shell kill `pid com.android.phone`; verify that the phone did not lock
Change-Id: Ic5aa51d3b0521740b828d934c6653f8d5ae6380a
Bernardo Rufino [Tue, 24 Apr 2018 12:20:29 +0000 (05:20 -0700)]
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
am:
ad8159bea0
Change-Id: I3500ed3ae311d5df2ddf265a7132ac05d7eb536c
TreeHugger Robot [Tue, 24 Apr 2018 12:12:53 +0000 (12:12 +0000)]
Merge "Check self permission in BackupManager#isBackupServiceActive" into pi-dev
David Brazdil [Tue, 24 Apr 2018 12:05:47 +0000 (12:05 +0000)]
Merge "Add more hidden APIs to light greylist"
Jorim Jaggi [Tue, 24 Apr 2018 11:54:11 +0000 (04:54 -0700)]
Merge "Only allow using PendingRemAnimRegistry on top launched activity" into pi-dev am:
0bbd1f573f
am:
f850b245d5
Change-Id: Ic4b2e1dfb12c488e87fed5e367dd832ccc829181
Artem Iglikov [Tue, 24 Apr 2018 11:46:44 +0000 (12:46 +0100)]
Add list of approved services in addApprovedList
... instead of replacing it. I.e., do what the method name claims to do
in order to fix restoring. Otherwise during restore the list of
components is getting set to the list of the components from backup set,
i.e., list of pre-approved components is lost.
This is ag/
3939056 in master.
Bug:
77630371
Test: with a backup set for package "android" created with LocalTransport run (also see the bug) adb root && adb shell bmgr enable true && adb shell bmgr transport android/com.android.internal.backup.LocalTransport && adb shell bmgr backupnow android && adb shell rm -rf /cache/backup/1/_delta/android/ && adb push android /cache/backup/1/_delta/ && adb shell cat /data/system/notification_policy.xml | grep enabled_listeners -C 5 && adb shell bmgr restore 1 android && adb shell cat /data/system/notification_policy.xml | grep enabled_listeners -C 5
Test: atest FrameworksUiServicesTests
Change-Id: Ie0eb6ef6629fb4c6d97f06b891282aa3e5563456
Jorim Jaggi [Tue, 24 Apr 2018 11:45:31 +0000 (04:45 -0700)]
Merge "Only allow using PendingRemAnimRegistry on top launched activity" into pi-dev
am:
0bbd1f573f
Change-Id: Id077a12926a375f727f94882a4a08d6387940e28
Jorim Jaggi [Tue, 24 Apr 2018 11:32:02 +0000 (11:32 +0000)]
Merge "Only allow using PendingRemAnimRegistry on top launched activity" into pi-dev
Rubin Xu [Tue, 24 Apr 2018 11:20:14 +0000 (04:20 -0700)]
Merge "Clarify SystemUpdatePolicy" into pi-dev am:
4019c39405
am:
5fbc0e59f5
Change-Id: Ia4f9475bac63504d9332bf576d9e12517e89d23a
Rubin Xu [Tue, 24 Apr 2018 11:10:58 +0000 (04:10 -0700)]
Merge "Clarify SystemUpdatePolicy" into pi-dev
am:
4019c39405
Change-Id: I7d9129aaa404940391139acf2f40eca97fda9165
TreeHugger Robot [Tue, 24 Apr 2018 10:59:50 +0000 (10:59 +0000)]
Merge "Clarify SystemUpdatePolicy" into pi-dev
David Brazdil [Mon, 23 Apr 2018 16:54:24 +0000 (17:54 +0100)]
Add more hidden APIs to light greylist
Bug:
78242776
Test: make
Merged-In: I3e1f6acd805ca73509a896066a336432f29d0c87
Change-Id: Ieb2eb62201a6f270afd76ae3f6e5ca6226dd57a6
David Brazdil [Mon, 23 Apr 2018 16:54:24 +0000 (17:54 +0100)]
Add more hidden APIs to light greylist
Bug:
78242776
Test: make
Change-Id: I3e1f6acd805ca73509a896066a336432f29d0c87
Bernardo Rufino [Tue, 24 Apr 2018 10:29:02 +0000 (11:29 +0100)]
Check self permission in BackupManager#isBackupServiceActive
Old method only checked for IPC caller, method isn't an IPC, adding
check for self permission as well.
Bug:
78467264
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testBackupServiceActive
Change-Id: If9eed90f2deaaf1a4f2376fdf1881e62ee8954fb
Bernardo Rufino [Tue, 24 Apr 2018 10:29:02 +0000 (11:29 +0100)]
Check self permission in BackupManager#isBackupServiceActive
Old method only checked for IPC caller, method isn't an IPC, adding
check for self permission as well.
Bug:
78467264
Test: atest com.google.android.gts.devicepolicy.DeviceOwnerTest#testBackupServiceActive
Change-Id: If9eed90f2deaaf1a4f2376fdf1881e62ee8954fb
Chalard Jean [Tue, 24 Apr 2018 10:10:25 +0000 (03:10 -0700)]
Merge changes I0cd83a93,I03ae2bbb into pi-dev am:
411e79b8b0
am:
a4eec2cefa
Change-Id: Ia8f985b448251f911484e6bd63fa562bffc1b0e4
Chalard Jean [Tue, 24 Apr 2018 10:02:11 +0000 (03:02 -0700)]
Merge changes I0cd83a93,I03ae2bbb into pi-dev
am:
411e79b8b0
Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
Chalard Jean [Tue, 24 Apr 2018 09:53:32 +0000 (09:53 +0000)]
Merge changes I0cd83a93,I03ae2bbb into pi-dev
* changes:
Make sure getActiveNetwork is consistent with default callbacks
Add tests for getActiveNetwork.
TreeHugger Robot [Tue, 24 Apr 2018 09:43:27 +0000 (09:43 +0000)]
Merge "Avoid internal method call and its branching."
OSDN Git Service
