Merge changes from topic "user-key-rename" into main am: 7490fc59
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796609 Change-Id: I46bd16fb681fa860ef4a4aed35cf8ea265c704c5 Signed-off-by:Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
No related branches found
No related tags found
Showing
- core/java/android/os/StrictMode.java 7 additions, 7 deletionscore/java/android/os/StrictMode.java
- core/java/android/os/storage/IStorageManager.aidl 6 additions, 6 deletionscore/java/android/os/storage/IStorageManager.aidl
- core/java/android/os/storage/StorageManager.java 56 additions, 11 deletionscore/java/android/os/storage/StorageManager.java
- services/core/java/com/android/server/StorageManagerService.java 26 additions, 26 deletions...s/core/java/com/android/server/StorageManagerService.java
- services/core/java/com/android/server/am/ActivityManagerService.java 2 additions, 2 deletions...re/java/com/android/server/am/ActivityManagerService.java
- services/core/java/com/android/server/am/UserController.java 15 additions, 15 deletionsservices/core/java/com/android/server/am/UserController.java
- services/core/java/com/android/server/locksettings/LockSettingsService.java 21 additions, 19 deletions.../com/android/server/locksettings/LockSettingsService.java
- services/core/java/com/android/server/pm/UserManagerService.java 7 additions, 6 deletions...s/core/java/com/android/server/pm/UserManagerService.java
- services/tests/servicestests/src/com/android/server/am/UserControllerTest.java 5 additions, 5 deletions...estests/src/com/android/server/am/UserControllerTest.java
- services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java 4 additions, 4 deletions...oid/server/locksettings/BaseLockSettingsServiceTests.java
- services/tests/servicestests/src/com/android/server/locksettings/FakeStorageManager.java 2 additions, 2 deletions...c/com/android/server/locksettings/FakeStorageManager.java
Loading
Please register or sign in to comment