diff options
| author | Mathew Inwood <mathewi@google.com> | 2018-08-01 17:22:54 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-01 17:22:54 -0700 |
| commit | e377a769bd12321b4d94a05fc1ffb6cb03cb42d9 (patch) | |
| tree | e6d50b118839c2160f7920d35e2d0f797afc5070 /keystore/java/android/security/KeyStore.java | |
| parent | 767ce85da6ab2664ca1d481f342f3b75cf10ab40 (diff) | |
| parent | 842e88250752f6492e02930f1a106a88e89fd165 (diff) | |
Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f am: 02763a1c3e
am: 842e882507
Change-Id: If4c2746b23ca5bdef08635e78b3aca914bb9e52f
Diffstat (limited to 'keystore/java/android/security/KeyStore.java')
| -rw-r--r-- | keystore/java/android/security/KeyStore.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyStore.java b/keystore/java/android/security/KeyStore.java index fe05c13c999b..3ea1f2645af8 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; |