OSDN Git Service

Refactor PlatformKeyManger to remove mUserId to fix two tests that fail
authorBo Zhu <bozhu@google.com>
Fri, 5 Jan 2018 06:42:36 +0000 (22:42 -0800)
committerBo Zhu <bozhu@google.com>
Fri, 5 Jan 2018 21:09:52 +0000 (13:09 -0800)
commit3462c832d1acccca3cdd541dea86442eb81536ab
tree81092b8abcabeb0f0aafef96d253b0888f5802b4
parent25e3210eaf792c81308fe228a91527adc5ad9eed
Refactor PlatformKeyManger to remove mUserId to fix two tests that fail
on clean devices without secure screenlocks

The mUserId is removed to allow a mocked PlatformKeyManager to be passed
into RecoverableKeyStoreManager for tests.

Test: adb shell am instrument -w -e package
com.android.server.locksettings.recoverablekeystore
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner

Change-Id: I9b1fda3c7d869b683cd71cb81ea88da5d995ace9
services/core/java/com/android/server/locksettings/recoverablekeystore/KeySyncTask.java
services/core/java/com/android/server/locksettings/recoverablekeystore/PlatformKeyManager.java
services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/KeySyncTaskTest.java
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/PlatformKeyManagerTest.java
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java