am 61043233: Merge "Change name of confirm credentials method after API review" into lmp-dev (c80aaf38) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -4510,8 +4510,8 @@ package android.app {
		}

		public class KeyguardManager {
		method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
		method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
		method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
		method public boolean inKeyguardRestrictedInputMode();
		method public boolean isKeyguardLocked();
		method public boolean isKeyguardSecure();

+8 −0

Original line number	Diff line number	Diff line
		package android.app {

		public class KeyguardManager {
		method public android.content.Intent getConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);
		}

		}

		package android.media {

		public class AudioFormat {

+8 −1

Original line number	Diff line number	Diff line
		@@ -55,6 +55,13 @@ public class KeyguardManager {
		*/
		public static final String EXTRA_DESCRIPTION = "android.app.extra.DESCRIPTION";

		/**
		* @removed
		*/
		public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
		return createConfirmDeviceCredentialIntent(title, description);
		}

		/**
		* Get an intent to prompt the user to confirm credentials (pin, pattern or password)
		* for the current user of the device. The caller is expected to launch this activity using
		@@ -63,7 +70,7 @@ public class KeyguardManager {
		*
		* @return the intent for launching the activity or null if no password is required.
		**/
		public Intent getConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
		public Intent createConfirmDeviceCredentialIntent(CharSequence title, CharSequence description) {
		if (!isKeyguardSecure()) return null;
		Intent intent = new Intent(ACTION_CONFIRM_DEVICE_CREDENTIAL);
		intent.putExtra(EXTRA_TITLE, title);