diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java index 01a92b8bc418c..fb84e31c3eedf 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java @@ -3328,7 +3328,7 @@ public class CentralSurfacesImpl extends CoreStartable implements @Override public boolean onBackPressed() { if (mStatusBarKeyguardViewManager.canHandleBackPressed()) { - mStatusBarKeyguardViewManager.onBackPressed(false /* unused */); + mStatusBarKeyguardViewManager.onBackPressed(); return true; } if (mNotificationPanelViewController.isQsCustomizing()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java index 6e1cf13d01d79..1b8f0ac7c035d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java @@ -203,7 +203,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb if (DEBUG) { Log.d(TAG, "onBackInvokedCallback() called, invoking onBackPressed()"); } - onBackPressed(false /* unused */); + onBackPressed(); }; private boolean mIsBackCallbackRegistered = false; @@ -1098,16 +1098,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb /** * Notifies this manager that the back button has been pressed. */ - // TODO(b/244635782): This "accept boolean and ignore it, and always return false" was done - // to make it possible to check this in *and* allow merging to master, - // where ArcStatusBarKeyguardViewManager inherits this class, and its - // build will break if we change this interface. - // So, overall, while this function refactors the behavior of onBackPressed, - // (it now handles the back press, and no longer returns *whether* it did so) - // its interface is not changing right now (but will, in a follow-up CL). - public boolean onBackPressed(boolean ignored) { + public void onBackPressed() { if (!canHandleBackPressed()) { - return false; + return; } mCentralSurfaces.endAffordanceLaunch(); @@ -1128,7 +1121,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb mNotificationPanelViewController.expandWithoutQs(); } } - return false; + return; } @Override