diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-03-15 22:12:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-15 22:12:11 +0000 |
| commit | 6cdb257f376d748d42b7ff3cd0499df97a0ab462 (patch) | |
| tree | 687c370e57b884f61e2adcd45ae8c0162638deee /core/java/android | |
| parent | e4f51c74ee61a466c931a93c3a5601995076a196 (diff) | |
| parent | 6a8f8912052ac1d1c160cc61acf92d318f4ee44b (diff) | |
Merge changes from topic "remove-auth-token" am: 6a8f891205
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021760
Change-Id: Idf2af61afa9d30923272d29667aa2118eb971f30
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/storage/IStorageManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/storage/StorageManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl index 3f91e22819e5..5bf1b04b8e53 100644 --- a/core/java/android/os/storage/IStorageManager.aidl +++ b/core/java/android/os/storage/IStorageManager.aidl @@ -120,7 +120,7 @@ interface IStorageManager { void setDebugFlags(int flags, int mask) = 60; void createUserKey(int userId, int serialNumber, boolean ephemeral) = 61; void destroyUserKey(int userId) = 62; - void unlockUserKey(int userId, int serialNumber, in byte[] token, in byte[] secret) = 63; + void unlockUserKey(int userId, int serialNumber, in byte[] secret) = 63; void lockUserKey(int userId) = 64; boolean isUserKeyUnlocked(int userId) = 65; void prepareUserStorage(in String volumeUuid, int userId, int serialNumber, int flags) = 66; diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java index 4540574f342a..6dd878cbfe95 100644 --- a/core/java/android/os/storage/StorageManager.java +++ b/core/java/android/os/storage/StorageManager.java @@ -1528,9 +1528,9 @@ public class StorageManager { } /** {@hide} */ - public void unlockUserKey(int userId, int serialNumber, byte[] token, byte[] secret) { + public void unlockUserKey(int userId, int serialNumber, byte[] secret) { try { - mStorageManager.unlockUserKey(userId, serialNumber, token, secret); + mStorageManager.unlockUserKey(userId, serialNumber, secret); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } |