Merge "Remove KeyStore#state()" into main (28dc9370) · Commits · e / os / android_frameworks_base

keystore/java/android/security/AndroidKeyStoreMaintenance.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -127,25 +127,6 @@ public class AndroidKeyStoreMaintenance {
		}
		}

		/**
		* Queries user state from Keystore 2.0.
		*
		* @param userId - Android user id of the user.
		* @return UserState enum variant as integer if successful or an error
		*/
		public static int getState(int userId) {
		StrictMode.noteDiskRead();
		try {
		return getService().getState(userId);
		} catch (ServiceSpecificException e) {
		Log.e(TAG, "getState failed", e);
		return e.errorCode;
		} catch (Exception e) {
		Log.e(TAG, "Can not connect to keystore", e);
		return SYSTEM_ERROR;
		}
		}

		/**
		* Informs Keystore 2.0 that an off body event was detected.
		*/

+0 −33

Original line number	Diff line number	Diff line
		@@ -19,8 +19,6 @@ package android.security;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.os.Build;
		import android.os.StrictMode;
		import android.os.UserHandle;
		import android.security.maintenance.UserState;

		/**
		* @hide This should not be made public in its present form because it
		@@ -37,15 +35,6 @@ public class KeyStore {
		// Used for UID field to indicate the calling UID.
		public static final int UID_SELF = -1;

		// States
		public enum State {
		@UnsupportedAppUsage
		UNLOCKED,
		@UnsupportedAppUsage
		LOCKED,
		UNINITIALIZED
		};

		private static final KeyStore KEY_STORE = new KeyStore();

		@UnsupportedAppUsage
		@@ -53,28 +42,6 @@ public class KeyStore {
		return KEY_STORE;
		}

		/** @hide */
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public State state(int userId) {
		int userState = AndroidKeyStoreMaintenance.getState(userId);
		switch (userState) {
		case UserState.UNINITIALIZED:
		return KeyStore.State.UNINITIALIZED;
		case UserState.LSKF_UNLOCKED:
		return KeyStore.State.UNLOCKED;
		case UserState.LSKF_LOCKED:
		return KeyStore.State.LOCKED;
		default:
		throw new AssertionError(userState);
		}
		}

		/** @hide */
		@UnsupportedAppUsage
		public State state() {
		return state(UserHandle.myUserId());
		}

		/** @hide */
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public byte[] get(String key) {