summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2017-04-24 18:06:20 -0600
committerJeff Sharkey <jsharkey@android.com>2017-04-25 13:12:45 -0600
commit0f3f60b576aedc78524d50da3dadada2201e63c2 (patch)
tree10687f8ec2be4c125de12c100effc0c796a4b529 /keystore/java/android/security/KeyChain.java
parent30e06bb668f2e4b024c4ebc2a131de91c96de5eb (diff)
Fix some issues found by new doclava linter.
Add missing API annotations for permissions and SdkConstants, and invoke doclava with new "-android" flag. Test: make -j32 offline-sdk-docs Bug: 37526420 Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
-rw-r--r--keystore/java/android/security/KeyChain.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java
index 5c64566f7987..ea804d0abea3 100644
--- a/keystore/java/android/security/KeyChain.java
+++ b/keystore/java/android/security/KeyChain.java
@@ -17,7 +17,9 @@ package android.security;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.SdkConstant;
import android.annotation.WorkerThread;
+import android.annotation.SdkConstant.SdkConstantType;
import android.app.Activity;
import android.app.PendingIntent;
import android.app.Service;
@@ -199,12 +201,14 @@ public final class KeyChain {
* {@link Build.VERSION_CODES#N_MR1} will only receive this broadcast if they register for it
* at runtime.
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_STORAGE_CHANGED = "android.security.STORAGE_CHANGED";
/**
* Broadcast Action: Indicates the contents of the keychain has changed. Sent when a KeyChain
* entry is added, modified or removed.
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_KEYCHAIN_CHANGED = "android.security.action.KEYCHAIN_CHANGED";
/**
@@ -216,6 +220,7 @@ public final class KeyChain {
* <li>A CA is added or removed from the trust store</li>
* </ul>
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_TRUST_STORE_CHANGED =
"android.security.action.TRUST_STORE_CHANGED";
@@ -223,6 +228,7 @@ public final class KeyChain {
* Broadcast Action: Indicates that the access permissions for a private key have changed.
*
*/
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_KEY_ACCESS_CHANGED =
"android.security.action.KEY_ACCESS_CHANGED";