Rename "user key" methods in vold
Rename methods that refer to "user key" to be more precise about what
they mean. For more details, see the corresponding frameworks/base
changes (I202ebbfd2b4f79fedb3ed120a8ad81500c126894 and
I5894beb97823dced5954e405d779fada49c79e8d).
No change in behavior except for some changed log messages.
Flag: exempt, mechanical refactoring only
Test: presubmit
Change-Id: I9edcb557172395f4f6cf8e837efcc06fcfefb37d
diff --git a/binder/android/os/IVold.aidl b/binder/android/os/IVold.aidl
index 19e8e91..852e8af 100644
--- a/binder/android/os/IVold.aidl
+++ b/binder/android/os/IVold.aidl
@@ -85,14 +85,14 @@
void setStorageBindingSeed(in byte[] seed);
- void createUserKey(int userId, int userSerial, boolean ephemeral);
- void destroyUserKey(int userId);
+ void createUserStorageKeys(int userId, int userSerial, boolean ephemeral);
+ void destroyUserStorageKeys(int userId);
- void setUserKeyProtection(int userId, @utf8InCpp String secret);
+ void setCeStorageProtection(int userId, @utf8InCpp String secret);
int[] getUnlockedUsers();
- void unlockUserKey(int userId, int userSerial, @utf8InCpp String secret);
- void lockUserKey(int userId);
+ void unlockCeStorage(int userId, int userSerial, @utf8InCpp String secret);
+ void lockCeStorage(int userId);
void prepareUserStorage(@nullable @utf8InCpp String uuid, int userId, int userSerial,
int storageFlags);