Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ee4fb6f authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove unused constants for encrypted OBBs 

Remove a few things that I missed in commit 8bc9340b ("Remove broken
code for mounting encrypted OBB files").

Bug: 216475849
Change-Id: Ia0bb426038ba6ad4d5aab25e9a56b1b535572283
parent 855ec2d3

services/core/java/com/android/server/StorageManagerService.java

+0 −13
Original line number Diff line number Diff line
@@ -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;
@@ -619,18 +618,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";