summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2022-03-17 22:57:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-17 22:57:31 +0000
commitec56282d41cd2ee40ce40fda21e8beb8ed21e24b (patch)
tree8edeac60a083e15a18ec4ff3cc53df340f5d151a /core/java/android
parent6e1ff4e3e95d9af44d889d8f039275e26985a2e8 (diff)
parent071a3b1820f2e702870e52ec0b707a1dfc95ebdb (diff)
Merge "Remove support for converting from FDE to FBE" am: 855ec2d31a am: 6a72370d4b am: 071a3b1820
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2027583 Change-Id: I7949c7f4b4d62f8a38563b2705995cefa69cedaa
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/storage/IStorageManager.aidl1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/os/storage/IStorageManager.aidl b/core/java/android/os/storage/IStorageManager.aidl
index c021c079ae2e..a0f6598640ba 100644
--- a/core/java/android/os/storage/IStorageManager.aidl
+++ b/core/java/android/os/storage/IStorageManager.aidl
@@ -125,7 +125,6 @@ interface IStorageManager {
boolean isUserKeyUnlocked(int userId) = 65;
void prepareUserStorage(in String volumeUuid, int userId, int serialNumber, int flags) = 66;
void destroyUserStorage(in String volumeUuid, int userId, int flags) = 67;
- boolean isConvertibleToFBE() = 68;
void addUserKeyAuth(int userId, int serialNumber, in byte[] secret) = 70;
void fixateNewestUserKeyAuth(int userId) = 71;
void fstrim(int flags, IVoldTaskListener listener) = 72;