summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStore.java
diff options
context:
space:
mode:
authorMathew Inwood <mathewi@google.com>2018-08-01 16:35:28 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-08-01 16:35:28 -0700
commit842e88250752f6492e02930f1a106a88e89fd165 (patch)
treef9eab363b0c65502ead9e2293e35d08516025cb6 /keystore/java/android/security/KeyStore.java
parent9f0aff0d989d25ee8248296bc3f413b97bf57e0b (diff)
parent02763a1c3ee13389598bfd00f895845b32cb3a93 (diff)
Merge "Code reformatting for upcoming annotations." am: 60c8cfdd0f
am: 02763a1c3e Change-Id: Icdbef4bd0e71876a3ddb296ca38a243209f2eaf9
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 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;