diff options
| author | 2022-03-22 18:04:57 +0000 | |
|---|---|---|
| committer | 2022-03-22 18:04:57 +0000 | |
| commit | d57ea65e01c1518c4e2f8eb4f945a2069b81b7d0 (patch) | |
| tree | a419be077c47178640c8f29832fe127df4a60500 | |
| parent | 3abc52220bbd8cc762fa89ec7db3ffbd03efdf20 (diff) | |
| parent | f3de5d353dcb66200d81cc39df8631822fccf8af (diff) | |
Merge "Remove unused constants for encrypted OBBs" am: 7798463944 am: 320f6742c9 am: f3de5d353d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031026
Change-Id: Idf4d4d6171b187c1577a72c6c74fc55ff6fe4fb1
| -rw-r--r-- | services/core/java/com/android/server/StorageManagerService.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index ada663be58b1..af7dcd114066 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -38,7 +38,6 @@ import static android.os.ParcelFileDescriptor.MODE_READ_WRITE; import static android.os.storage.OnObbStateChangeListener.ERROR_ALREADY_MOUNTED; import static android.os.storage.OnObbStateChangeListener.ERROR_COULD_NOT_MOUNT; import static android.os.storage.OnObbStateChangeListener.ERROR_COULD_NOT_UNMOUNT; -import static android.os.storage.OnObbStateChangeListener.ERROR_INTERNAL; import static android.os.storage.OnObbStateChangeListener.ERROR_NOT_MOUNTED; import static android.os.storage.OnObbStateChangeListener.ERROR_PERMISSION_DENIED; import static android.os.storage.OnObbStateChangeListener.MOUNTED; @@ -616,18 +615,6 @@ class StorageManagerService extends IStorageManager.Stub private final Callbacks mCallbacks; private final LockPatternUtils mLockPatternUtils; - /** - * The size of the crypto algorithm key in bits for OBB files. Currently - * Twofish is used which takes 128-bit keys. - */ - private static final int CRYPTO_ALGORITHM_KEY_SIZE = 128; - - /** - * The number of times to run SHA1 in the PBKDF2 function for OBB files. - * 1024 is reasonably secure and not too slow. - */ - private static final int PBKDF2_HASH_ROUNDS = 1024; - private static final String ANR_DELAY_MILLIS_DEVICE_CONFIG_KEY = "anr_delay_millis"; |