OSDN Git Service
Chavi Weingarten [Wed, 25 Apr 2018 14:55:06 +0000 (07:55 -0700)]
Merge "Synchronize RootWindowContainerTests" into pi-dev
am:
628e9b3d37
Change-Id: Ic7c2f187a063fa4289b25d06ea7e917f8aa33c5c
Chavi Weingarten [Wed, 25 Apr 2018 14:44:17 +0000 (14:44 +0000)]
Merge "Synchronize RootWindowContainerTests" into pi-dev
Jorim Jaggi [Wed, 25 Apr 2018 14:34:14 +0000 (07:34 -0700)]
Merge "Potentially fix notification launch animation" into pi-dev
am:
8f699919ce
Change-Id: I0ff778f32604091d496bdbb92cc5d19100bd5073
David Brazdil [Wed, 25 Apr 2018 14:29:04 +0000 (07:29 -0700)]
Merge "Add new hidden APIs" into pi-dev
am:
eb0e982228
Change-Id: I0ad7cad60cb758b9ddd827612e55c43c785ebd42
Jorim Jaggi [Wed, 25 Apr 2018 14:17:45 +0000 (14:17 +0000)]
Merge "Potentially fix notification launch animation" into pi-dev
David Brazdil [Wed, 25 Apr 2018 13:59:20 +0000 (13:59 +0000)]
Merge "Add new hidden APIs" into pi-dev
Mathew Inwood [Wed, 25 Apr 2018 13:56:06 +0000 (06:56 -0700)]
Merge "Add more light greylist entries." into pi-dev
am:
72b1a7ecb9
Change-Id: I97e4125143f7d1c9588a993a1f9c9fd52aeabc2b
Mathew Inwood [Wed, 25 Apr 2018 13:41:44 +0000 (13:41 +0000)]
Merge "Add more light greylist entries." into pi-dev
Wale Ogunwale [Wed, 25 Apr 2018 13:30:49 +0000 (06:30 -0700)]
Merge "Added OWNERS file to am package." into pi-dev
am:
c907be6fd5
Change-Id: I52f65ea0ca8213cc56b3795ff6eac88ec485a955
Wale Ogunwale [Wed, 25 Apr 2018 13:15:07 +0000 (13:15 +0000)]
Merge "Added OWNERS file to am package." into pi-dev
David Brazdil [Wed, 25 Apr 2018 10:49:16 +0000 (11:49 +0100)]
Add new hidden APIs
Bug:
78552452
Test: make
Change-Id: I73dc97a33b645f6cd9b7bf4a37254737ed3107ce
Nicolas Geoffray [Wed, 25 Apr 2018 10:07:52 +0000 (03:07 -0700)]
Merge "New light grey APIs." into pi-dev
am:
36c643ed4f
Change-Id: I1d3d7e2c506d60b2d8229bcf52cd3a5d20c697bc
Nicolas Geoffray [Wed, 25 Apr 2018 10:03:21 +0000 (03:03 -0700)]
Merge "More light grey APIs." into pi-dev
am:
3d33656347
Change-Id: I108782a08b97f90fee5a7f6cb6808256fda70dfb
Nicolas Geoffray [Wed, 25 Apr 2018 09:56:31 +0000 (02:56 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
be8638307f
Change-Id: I999a544aca5805d3655419f5da6728058184d7a1
TreeHugger Robot [Wed, 25 Apr 2018 09:54:06 +0000 (09:54 +0000)]
Merge "New light grey APIs." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 09:51:04 +0000 (09:51 +0000)]
Merge "More light grey APIs." into pi-dev
TreeHugger Robot [Wed, 25 Apr 2018 09:41:41 +0000 (09:41 +0000)]
Merge "Add more light grey APIs." into pi-dev
Eran Messeri [Wed, 25 Apr 2018 09:39:53 +0000 (02:39 -0700)]
Merge "Remove unnecessary WTFs from password state check" into pi-dev
am:
24ba8398fe
Change-Id: I8a8c66ba6bb0c83c1f57cfd48761863d3a8a4f72
Eran Messeri [Wed, 25 Apr 2018 09:28:15 +0000 (09:28 +0000)]
Merge "Remove unnecessary WTFs from password state check" into pi-dev
Nicolas Geoffray [Tue, 24 Apr 2018 12:26:45 +0000 (13:26 +0100)]
Add more light grey APIs.
bug:
64382372
Test: m
Change-Id: Ib15b65c376e4038232d4c1e04d10e508b34786af
Nicolas Geoffray [Tue, 24 Apr 2018 12:44:11 +0000 (13:44 +0100)]
More light grey APIs.
bug:
78436346
Test: m
Change-Id: I8bff5332abc93d49170c77fabb589bbcfa9249b6
Nicolas Geoffray [Tue, 24 Apr 2018 13:02:02 +0000 (14:02 +0100)]
New light grey APIs.
bug:
78471731
Test: m
Change-Id: I52f34f735873de485a73169f1ebbffe9484d0fb7
Yu-Han Yang [Wed, 25 Apr 2018 04:07:52 +0000 (21:07 -0700)]
Merge "Refactor GnssGeofenceProvider" into pi-dev
am:
728cb519a5
Change-Id: I165ae0783ce26c28ddb19ec68666a810855535b0
Yu-Han Yang [Wed, 25 Apr 2018 03:55:08 +0000 (03:55 +0000)]
Merge "Refactor GnssGeofenceProvider" into pi-dev
Joshua Brown [Wed, 25 Apr 2018 03:49:39 +0000 (20:49 -0700)]
Merge "Extract interface for the TemperatureView" into pi-dev
am:
db7bb0bcef
Change-Id: I163424166b8a3a4c987fd6cf7a16c721afb64701
TreeHugger Robot [Wed, 25 Apr 2018 03:37:46 +0000 (03:37 +0000)]
Merge "Extract interface for the TemperatureView" into pi-dev
Jack Yu [Wed, 25 Apr 2018 00:43:18 +0000 (17:43 -0700)]
Merge "Fixed the document of getNetworkCountryIso" am:
8252157aca
am:
7f97be01f5
Change-Id: I5c8cf44658007f6366d497c09f1cfba10a49da48
Jack Yu [Wed, 25 Apr 2018 00:31:23 +0000 (17:31 -0700)]
Merge "Fixed the document of getNetworkCountryIso"
am:
8252157aca
Change-Id: I6d4c5183d525a36bf1f1cee7fd034772427a3d32
Wale Ogunwale [Tue, 24 Apr 2018 19:51:03 +0000 (12:51 -0700)]
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
Shuo Qian [Wed, 25 Apr 2018 00:12:10 +0000 (17:12 -0700)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
am:
c4c7c19b67
Change-Id: I453a20d444aeaff500b6272fb352494420699557
Shuo Qian [Tue, 24 Apr 2018 23:54:10 +0000 (23:54 +0000)]
Merge "Revert "Revert "Remove the OEM hook implementation and usage""" into pi-dev
Robert Greenwalt [Tue, 24 Apr 2018 00:33:24 +0000 (00:33 +0000)]
Revert "Revert "Remove the OEM hook implementation and usage""
This reverts commit
7cfc5cda2f2a382a3eabd1c5382c412f2d1dedcf.
Reason for revert: Causes a critical error on Cuttlefish.
Bug:
78299964
Change-Id: Icb06aea5eb42fd156a967c4d4e39aefc51d91cf4
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:02:38 +0000 (23:02 +0000)]
Merge "Fixed the document of getNetworkCountryIso"
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:42:46 +0000 (15:42 -0700)]
Merge "Fix destruction of preserved surfaces for non app windows." into pi-dev
am:
6b683ecf6e
Change-Id: I3498de97f677e62050388e38462632475714e4a4
chaviw [Tue, 24 Apr 2018 22:23:53 +0000 (15:23 -0700)]
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
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: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: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
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
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
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
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
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
Eran Messeri [Mon, 23 Apr 2018 15:06:04 +0000 (16:06 +0100)]
Remove unnecessary WTFs from password state check
It is possible to have null PasswordMetrics object for a given user -
if, for example, the user never had a password set.
Do not WTF in that case.
Bug:
78191197
Test: That it compiles.
Change-Id: I807c2755890b0772e295b4cb0095cac1bf2d0aef
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:18:03 +0000 (10:18 -0700)]
Merge "config.xml: Add config flag for filtering DBS scans" into pi-dev
am:
cd8d257d42
Change-Id: Ic47ded2705c49ab4a956763d07d92f557a550455
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
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: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
Mathew Inwood [Tue, 24 Apr 2018 15:24:33 +0000 (16:24 +0100)]
Add more light greylist entries.
Scraped from bugreports by the compat bugbot module. See
go/hidden-api-colab for more details.
Test: m
Bug:
74410240
Bug:
77459362
Bug:
77927354
Bug:
78084664
Bug:
78371474
Bug:
78433404
Bug:
78436346
Bug:
78438386
Bug:
78467671
Bug:
78471731
Bug:
78483748
Bug:
78484047
Bug:
78485081
Change-Id: Ie79f892d5cdccef442944286cc718a079bc3031f
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."
Jorim Jaggi [Tue, 24 Apr 2018 14:33:56 +0000 (16:33 +0200)]
Potentially fix notification launch animation
If we don't have something to animate, immediately finish
animation
Test: Open a couple of notifications
Bug:
77847366
Change-Id: I06c651b33a5ffb4ec236ba41f9db38b0125684dd
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:00:03 +0000 (07:00 -0700)]
Merge "Keyguard: Don't lock when phone process crashes" into pi-dev
am:
fd935d3a12
Change-Id: I94cb7eb84ce34554524339bc1ba7c64cb7b2e46a
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: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 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:45:34 +0000 (12:45 +0000)]
Merge "update wifi unit test script" into pi-dev
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
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: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
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: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.
Selim Cinek [Tue, 24 Apr 2018 09:26:30 +0000 (02:26 -0700)]
Merge changes from topic "notification_reply_action" into pi-dev
am:
53790c1c8f
Change-Id: Ia6f227ca49a2004a2346da91cfea4f9a3fa65c47
OSDN Git Service
