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

Commit ef03435e authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Stop using FDE-related constants from IVold" am: 489ba5ac am:... 

Merge "Stop using FDE-related constants from IVold" am: 489ba5ac am: 84f05b1b am: e1a9ca0e am: 3abc5222

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2031025

Change-Id: I4f2322c1d89d96b2579f0126e876de9a1a48fee4
parents 120330f5 3abc5222

core/java/android/os/storage/StorageManager.java

+3 −29
Original line number Original line Diff line number Diff line
@@ -301,28 +301,7 @@ public class StorageManager { 




    /** @hide The volume is not encrypted. */

    /** @hide The volume is not encrypted. */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int ENCRYPTION_STATE_NONE =

    public static final int ENCRYPTION_STATE_NONE = 1;

            IVold.ENCRYPTION_STATE_NONE;



    /** @hide The volume has been encrypted succesfully. */

    public static final int ENCRYPTION_STATE_OK =

            IVold.ENCRYPTION_STATE_OK;



    /** @hide The volume is in a bad state. */

    public static final int ENCRYPTION_STATE_ERROR_UNKNOWN =

            IVold.ENCRYPTION_STATE_ERROR_UNKNOWN;



    /** @hide Encryption is incomplete */

    public static final int ENCRYPTION_STATE_ERROR_INCOMPLETE =

            IVold.ENCRYPTION_STATE_ERROR_INCOMPLETE;



    /** @hide Encryption is incomplete and irrecoverable */

    public static final int ENCRYPTION_STATE_ERROR_INCONSISTENT =

            IVold.ENCRYPTION_STATE_ERROR_INCONSISTENT;



    /** @hide Underlying data is corrupt */

    public static final int ENCRYPTION_STATE_ERROR_CORRUPT =

            IVold.ENCRYPTION_STATE_ERROR_CORRUPT;





    private static volatile IStorageManager sStorageManager = null;

    private static volatile IStorageManager sStorageManager = null;
@@ -3033,15 +3012,10 @@ public class StorageManager { 
    @GuardedBy("mFuseAppLoopLock")

    @GuardedBy("mFuseAppLoopLock")

    private @Nullable FuseAppLoop mFuseAppLoop = null;

    private @Nullable FuseAppLoop mFuseAppLoop = null;





    /// Consts to match the password types in cryptfs.h

    /** @hide */

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int CRYPT_TYPE_PASSWORD = IVold.PASSWORD_TYPE_PASSWORD;

    public static final int CRYPT_TYPE_PASSWORD = 0;

    /** @hide */

    /** @hide */

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static final int CRYPT_TYPE_DEFAULT = IVold.PASSWORD_TYPE_DEFAULT;

    public static final int CRYPT_TYPE_DEFAULT = 1;

    /** @hide */

    public static final int CRYPT_TYPE_PATTERN = IVold.PASSWORD_TYPE_PATTERN;

    /** @hide */

    public static final int CRYPT_TYPE_PIN = IVold.PASSWORD_TYPE_PIN;

}
 
}

core/java/com/android/internal/widget/LockscreenCredential.java

+0 −21
Original line number Original line Diff line number Diff line
@@ -175,27 +175,6 @@ public class LockscreenCredential implements Parcelable, AutoCloseable { 
        return mCredential;

        return mCredential;

    }

    }





    /**

     *  Returns the credential type recognized by {@link StorageManager}. Can be one of

     *  {@link StorageManager#CRYPT_TYPE_DEFAULT}, {@link StorageManager#CRYPT_TYPE_PATTERN},

     *  {@link StorageManager#CRYPT_TYPE_PIN} or {@link StorageManager#CRYPT_TYPE_PASSWORD}.

     */

    public int getStorageCryptType() {

        if (isNone()) {

            return StorageManager.CRYPT_TYPE_DEFAULT;

        }

        if (isPattern()) {

            return StorageManager.CRYPT_TYPE_PATTERN;

        }

        if (isPin()) {

            return StorageManager.CRYPT_TYPE_PIN;

        }

        if (isPassword()) {

            return StorageManager.CRYPT_TYPE_PASSWORD;

        }

        throw new IllegalStateException("Unhandled credential type");

    }



    /** Returns whether this is an empty credential */

    /** Returns whether this is an empty credential */

    public boolean isNone() {

    public boolean isNone() {

        ensureNotZeroized();

        ensureNotZeroized();

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

+0 −6
Original line number Original line Diff line number Diff line
@@ -598,12 +598,6 @@ class StorageManagerService extends IStorageManager.Stub 
        }

        }

    }

    }





    /** List of crypto types.

      * These must match CRYPT_TYPE_XXX in cryptfs.h AND their

      * corresponding commands in CommandListener.cpp */

    public static final String[] CRYPTO_TYPES

        = { "password", "default", "pattern", "pin" };



    private final Context mContext;

    private final Context mContext;

    private final ContentResolver mResolver;

    private final ContentResolver mResolver;