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

Commit 241ae10b authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Add explicit method to dismiss Keyguard 

The flag is a bit clunky for most cases, and a method is more
clear.

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardTests

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardLockedTests

Test: runtest systemui -c
com.android.systemui.keyguard.DismissCallbackRegistryTest

Bug: 30961403
Bug: 27422134
Change-Id: I39de90c7cfecd99350a74f72cd76418e337f2b79
parent d4f9d374

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
@@ -4817,6 +4817,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();









@@ -4826,12 +4827,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








@@ -4971,6 +4971,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();









@@ -4980,12 +4981,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








@@ -4827,6 +4827,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();









@@ -4836,12 +4837,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 {