Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix doze log"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-06 19:13:08 +00:00
committed by Android (Google) Code Review
parent 640f5d94b0 bcc606eae0
commit c9d3be9f4f
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java
View File

@@ -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;
}

1
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -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()