summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/KeyChainAliasCallback.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-11 19:43:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-11 19:43:46 +0000
commit09b15d5bdb2eebc5e63889297789c15e97fa24b5 (patch)
treec12444bf8fb351147c71b00a4004b13195f7b868 /keystore/java/android/security/KeyChainAliasCallback.java
parent5fccffd573395bbd21c477f064de7c25100c3f8a (diff)
parent54bb1596e470144932943046ec7a99551d020ba0 (diff)
downloadframeworks_base-09b15d5bdb2eebc5e63889297789c15e97fa24b5.zip
frameworks_base-09b15d5bdb2eebc5e63889297789c15e97fa24b5.tar.gz
frameworks_base-09b15d5bdb2eebc5e63889297789c15e97fa24b5.tar.bz2
Merge "Add NonNull and Nullable annotations to AndroidKeyStore API." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/KeyChainAliasCallback.java')
-rw-r--r--keystore/java/android/security/KeyChainAliasCallback.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/keystore/java/android/security/KeyChainAliasCallback.java b/keystore/java/android/security/KeyChainAliasCallback.java
index 2500863..8e41377 100644
--- a/keystore/java/android/security/KeyChainAliasCallback.java
+++ b/keystore/java/android/security/KeyChainAliasCallback.java
@@ -15,6 +15,8 @@
*/
package android.security;
+import android.annotation.Nullable;
+
/**
* The KeyChainAliasCallback is the callback for {@link
* KeyChain#choosePrivateKeyAlias}.
@@ -25,5 +27,5 @@ public interface KeyChainAliasCallback {
* Called with the alias of the certificate chosen by the user, or
* null if no value was chosen.
*/
- public void alias(String alias);
+ public void alias(@Nullable String alias);
}