OSDN Git Service

Get account features before taking lock (cherry-pick from master)
authorMakoto Onuki <omakoto@google.com>
Thu, 15 Dec 2016 22:26:55 +0000 (14:26 -0800)
committerMakoto Onuki <omakoto@google.com>
Wed, 4 Jan 2017 17:04:09 +0000 (09:04 -0800)
commitfd24353d75adbb0237fa13d209abe6b790535b8b
tree8300b6c77616a161414c13a0f2dc085efa1b3655
parent2dd60e81ada206abad107b88c404f6d9a62cdfde
Get account features before taking lock (cherry-pick from master)

Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *

Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests

Bug: 33481725
Change-Id: Ie2fe9aea87d1a7167581f4cd74ae063ef24a4567
Merged-in: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
services/tests/servicestests/src/com/android/server/devicepolicy/DpmMockContext.java