summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2018-08-01 18:08:20 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-01 18:08:20 -0700
commit8f299037474ce5e754c18f29f76b4c7d623479c0 (patch)
tree86636852a4ed1e2d44099a180f36ce61f11216a6 /keystore/java/android/security/KeyStore.java
parent58519002a2c2239ab63ef95487921e256ce5bcf5 (diff)
parente377a769bd12321b4d94a05fc1ffb6cb03cb42d9 (diff)
Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f am: 02763a1c3e am: 842e882507
am: e377a769bd Change-Id: I67465690c2addbbfbe53472e5b45783821990567
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
-rw-r--r--keystore/java/android/security/KeyStore.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java
index 850230943458..4f4ca3f47009 100644
--- a/keystore/java/android/security/KeyStore.java
+++ b/keystore/java/android/security/KeyStore.java
@@ -128,7 +128,11 @@ public class KeyStore {
public static final int FLAG_STRONGBOX = 1 << 4;
// States
- public enum State { UNLOCKED, LOCKED, UNINITIALIZED };
+ public enum State {
+ UNLOCKED,
+ LOCKED,
+ UNINITIALIZED
+ };
private int mError = NO_ERROR;