Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d25cf04e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add explicit method to dismiss Keyguard"

parents 3e68bb5d 241ae10b

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/backup/IObbBackupService.aidl \

	core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl \

	core/java/com/android/internal/policy/IKeyguardDrawnCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardDismissCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardExitCallback.aidl \

	core/java/com/android/internal/policy/IKeyguardService.aidl \

	core/java/com/android/internal/policy/IKeyguardStateCallback.aidl \

api/current.txt

+9 −1
Original line number Diff line number Diff line
@@ -4824,6 +4824,7 @@ package android.app { 














  public class KeyguardManager {















    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);













    method public void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);















    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);















    method public boolean inKeyguardRestrictedInputMode();















    method public boolean isDeviceLocked();









@@ -4833,12 +4834,19 @@ package android.app {













    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);















  }



























  public static abstract class KeyguardManager.KeyguardDismissCallback {













    ctor public KeyguardManager.KeyguardDismissCallback();













    method public void onDismissCancelled();













    method public void onDismissError();













    method public void onDismissSucceeded();













  }



























  public deprecated class KeyguardManager.KeyguardLock {















    method public void disableKeyguard();















    method public void reenableKeyguard();















  }



























  public static abstract interface KeyguardManager.OnKeyguardExitResult {













  public static abstract deprecated interface KeyguardManager.OnKeyguardExitResult {















    method public abstract void onKeyguardExitResult(boolean);















  }







































api/system-current.txt



+9
−1




























Original line number
Diff line number
Diff line








@@ -4978,6 +4978,7 @@ package android.app {



























  public class KeyguardManager {















    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);













    method public void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);















    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);















    method public boolean inKeyguardRestrictedInputMode();















    method public boolean isDeviceLocked();









@@ -4987,12 +4988,19 @@ package android.app {













    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);















  }



























  public static abstract class KeyguardManager.KeyguardDismissCallback {













    ctor public KeyguardManager.KeyguardDismissCallback();













    method public void onDismissCancelled();













    method public void onDismissError();













    method public void onDismissSucceeded();













  }



























  public deprecated class KeyguardManager.KeyguardLock {















    method public void disableKeyguard();















    method public void reenableKeyguard();















  }



























  public static abstract interface KeyguardManager.OnKeyguardExitResult {













  public static abstract deprecated interface KeyguardManager.OnKeyguardExitResult {















    method public abstract void onKeyguardExitResult(boolean);















  }







































api/test-current.txt



+9
−1




























Original line number
Diff line number
Diff line








@@ -4834,6 +4834,7 @@ package android.app {



























  public class KeyguardManager {















    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);













    method public void dismissKeyguard(android.app.Activity, android.app.KeyguardManager.KeyguardDismissCallback, android.os.Handler);















    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);















    method public boolean inKeyguardRestrictedInputMode();















    method public boolean isDeviceLocked();









@@ -4843,12 +4844,19 @@ package android.app {













    method public deprecated android.app.KeyguardManager.KeyguardLock newKeyguardLock(java.lang.String);















  }



























  public static abstract class KeyguardManager.KeyguardDismissCallback {













    ctor public KeyguardManager.KeyguardDismissCallback();













    method public void onDismissCancelled();













    method public void onDismissError();













    method public void onDismissSucceeded();













  }



























  public deprecated class KeyguardManager.KeyguardLock {















    method public void disableKeyguard();















    method public void reenableKeyguard();















  }



























  public static abstract interface KeyguardManager.OnKeyguardExitResult {













  public static abstract deprecated interface KeyguardManager.OnKeyguardExitResult {















    method public abstract void onKeyguardExitResult(boolean);















  }







































cmds/wm/src/com/android/commands/wm/Wm.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -274,7 +274,7 @@ public class Wm extends BaseCommand {













    }































    private void runDismissKeyguard() throws Exception {













        mWm.dismissKeyguard();













        mWm.dismissKeyguard(null /* callback */);















    }































    private int parseDimension(String s) throws NumberFormatException {