Merge "Code reformatting for upcoming annotations." (60c8cfdd) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyStore.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,11 @@ public class KeyStore {
		public static final int FLAG_CRITICAL_TO_DEVICE_ENCRYPTION = 1 << 3;

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

		private int mError = NO_ERROR;