summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
index 7c334375d47e..bc146fa0d246 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -649,15 +649,6 @@ public class StatusBar extends SystemUI implements DemoMode,
.Callback() {
@Override
public void onFinished() {
- notifyKeyguardState();
- }
-
- @Override
- public void onCancelled() {
- notifyKeyguardState();
- }
-
- private void notifyKeyguardState() {
if (mStatusBarKeyguardViewManager == null) {
Log.w(TAG, "Tried to notify keyguard visibility when "
+ "mStatusBarKeyguardViewManager was null");
@@ -665,6 +656,12 @@ public class StatusBar extends SystemUI implements DemoMode,
}
mStatusBarKeyguardViewManager.onKeyguardFadedAway();
}
+
+ @Override
+ public void onCancelled() {
+ // Transition was cancelled because another one took over.
+ // Nothing to do in here but wait.
+ }
};
private NotificationMessagingUtil mMessagingUtil;