Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev am:... (8910bf2c) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyChain.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.Nullable;
		import android.annotation.WorkerThread;
		import android.app.Activity;
		import android.app.PendingIntent;
		import android.app.Service;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.Intent;
		@@ -397,6 +398,9 @@ public final class KeyChain {
		*
		* <p> This method may block while waiting for a connection to another process, and must never
		* be called from the main thread.
		* <p> As {@link Activity} and {@link Service} contexts are short-lived and can be destroyed
		* at any time from the main thread, it is safer to rely on a long-lived context such as one
		* returned from {@link Context#getApplicationContext()}.
		*
		* @param alias The alias of the desired private key, typically returned via
		* {@link KeyChainAliasCallback#alias}.
		@@ -443,6 +447,9 @@ public final class KeyChain {
		*
		* <p> This method may block while waiting for a connection to another process, and must never
		* be called from the main thread.
		* <p> As {@link Activity} and {@link Service} contexts are short-lived and can be destroyed
		* at any time from the main thread, it is safer to rely on a long-lived context such as one
		* returned from {@link Context#getApplicationContext()}.
		*
		* @param alias The alias of the desired certificate chain, typically
		* returned via {@link KeyChainAliasCallback#alias}.