diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java index 09ebb6468a11d..ce1123ee67e01 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java @@ -70,7 +70,6 @@ public final class DozeServiceHost implements DozeHost { boolean mWakeLockScreenPerformsAuth = SystemProperties.getBoolean( "persist.sysui.wake_performs_auth", true); private boolean mDozingRequested; - private boolean mDozing; private boolean mPulsing; private WakefulnessLifecycle mWakefulnessLifecycle; private final SysuiStatusBarStateController mStatusBarStateController; @@ -196,8 +195,8 @@ public final class DozeServiceHost implements DozeHost { public void startDozing() { if (!mDozingRequested) { mDozingRequested = true; - mDozeLog.traceDozing(mDozing); updateDozing(); + mDozeLog.traceDozing(mStatusBarStateController.isDozing()); mStatusBar.updateIsKeyguard(); } } @@ -281,8 +280,8 @@ public final class DozeServiceHost implements DozeHost { public void stopDozing() { if (mDozingRequested) { mDozingRequested = false; - mDozeLog.traceDozing(mDozing); updateDozing(); + mDozeLog.traceDozing(mStatusBarStateController.isDozing()); } } @@ -292,7 +291,7 @@ public final class DozeServiceHost implements DozeHost { mDozeLog.tracePulseTouchDisabledByProx(ignore); } mIgnoreTouchWhilePulsing = ignore; - if (mDozing && ignore) { + if (mStatusBarStateController.isDozing() && ignore) { mStatusBarWindowViewController.cancelCurrentTouch(); } } @@ -448,10 +447,6 @@ public final class DozeServiceHost implements DozeHost { return mAnimateScreenOff; } - public void setDozing(boolean dozing) { - mDozing = dozing; - } - boolean getIgnoreTouchWhilePulsing() { return mIgnoreTouchWhilePulsing; } 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 a6a734a542f0c..862c9cbc1fe7e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -3491,7 +3491,6 @@ public class StatusBar extends SystemUI implements DemoMode, public void onDozingChanged(boolean isDozing) { Trace.beginSection("StatusBar#updateDozing"); mDozing = isDozing; - mDozeServiceHost.setDozing(mDozing); // Collapse the notification panel if open boolean dozingAnimated = mDozeServiceHost.getDozingRequested()