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

Merge "Fix issue where AOD would not start" into rvc-dev am: b164ea9d7a am: 6790d6b82a am: 7e79a2e053

Browse Source 
Change-Id: Ibab0efb587e748dbbf6f77cb54b2220ee2600488
This commit is contained in:
Lucas Dupin
2020-04-02 18:59:48 +00:00
committed by Automerger Merge Worker
parent d03a21b7ab 7e79a2e053
commit ae70a1e844
4 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
View File

@@ -57,27 +57,27 @@ public interface KeyguardViewController {
/**
* Called when the device started going to sleep.
*/
void onStartedGoingToSleep();
default void onStartedGoingToSleep() {};
/**
* Called when the device has finished going to sleep.
*/
void onFinishedGoingToSleep();
default void onFinishedGoingToSleep() {};
/**
* Called when the device started waking up.
*/
void onStartedWakingUp();
default void onStartedWakingUp() {};
/**
* Called when the device started turning on.
*/
void onScreenTurningOn();
default void onScreenTurningOn() {};
/**
* Called when the device has finished turning on.
*/
void onScreenTurnedOn();
default void onScreenTurnedOn() {};
/**
* Sets whether the Keyguard needs input.

7
packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
View File

@@ -16,6 +16,9 @@
package com.android.systemui.doze;
import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_AWAKE;
import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAKING;
import android.annotation.MainThread;
import android.hardware.display.AmbientDisplayConfiguration;
import android.os.Trace;
@@ -368,8 +371,8 @@ public class DozeMachine {
case DOZE_PULSE_DONE:
final State nextState;
@Wakefulness int wakefulness = mWakefulnessLifecycle.getWakefulness();
if (wakefulness == WakefulnessLifecycle.WAKEFULNESS_AWAKE
|| wakefulness == WakefulnessLifecycle.WAKEFULNESS_WAKING) {
if (state != State.INITIALIZED && (wakefulness == WAKEFULNESS_AWAKE
|| wakefulness == WAKEFULNESS_WAKING)) {
nextState = State.FINISH;
} else if (mDockManager.isDocked()) {
nextState = mDockManager.isHidden() ? State.DOZE : State.DOZE_AOD_DOCKED;

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

@@ -3338,12 +3338,12 @@ public class StatusBar extends SystemUI implements DemoMode,
Trace.traceCounter(Trace.TRACE_TAG_APP, "dozing", mDozing ? 1 : 0);
Trace.beginSection("StatusBar#updateDozingState");
boolean sleepingFromKeyguard =
mStatusBarKeyguardViewManager.isGoingToSleepVisibleNotOccluded();
boolean visibleNotOccluded = mStatusBarKeyguardViewManager.isShowing()
&& !mStatusBarKeyguardViewManager.isOccluded();
boolean wakeAndUnlock = mBiometricUnlockController.getMode()
== BiometricUnlockController.MODE_WAKE_AND_UNLOCK;
boolean animate = (!mDozing && mDozeServiceHost.shouldAnimateWakeup() && !wakeAndUnlock)
|| (mDozing && mDozeServiceHost.shouldAnimateScreenOff() && sleepingFromKeyguard);
|| (mDozing && mDozeServiceHost.shouldAnimateScreenOff() && visibleNotOccluded);
mNotificationPanelViewController.setDozing(mDozing, animate, mWakeUpTouchLocation);
updateQsExpansionEnabled();

27
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -168,7 +168,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
private boolean mLastIsDocked;
private boolean mLastPulsing;
private int mLastBiometricMode;
private boolean mGoingToSleepVisibleNotOccluded;
private boolean mLastLockVisible;
private OnDismissAction mAfterKeyguardGoneAction;
@@ -450,36 +449,11 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
}
}
public boolean isGoingToSleepVisibleNotOccluded() {
return mGoingToSleepVisibleNotOccluded;
}
@Override
public void onStartedGoingToSleep() {
mGoingToSleepVisibleNotOccluded = isShowing() && !isOccluded();
}
@Override
public void onFinishedGoingToSleep() {
mGoingToSleepVisibleNotOccluded = false;
mBouncer.onScreenTurnedOff();
}
@Override
public void onStartedWakingUp() {
// TODO: remove
}
@Override
public void onScreenTurningOn() {
// TODO: remove
}
@Override
public void onScreenTurnedOn() {
// TODO: remove
}
@Override
public void onRemoteInputActive(boolean active) {
mRemoteInputActive = active;
@@ -999,7 +973,6 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
pw.println(" mOccluded: " + mOccluded);
pw.println(" mRemoteInputActive: " + mRemoteInputActive);
pw.println(" mDozing: " + mDozing);
pw.println(" mGoingToSleepVisibleNotOccluded: " + mGoingToSleepVisibleNotOccluded);
pw.println(" mAfterKeyguardGoneAction: " + mAfterKeyguardGoneAction);
pw.println(" mAfterKeyguardGoneRunnables: " + mAfterKeyguardGoneRunnables);
pw.println(" mPendingWakeupAction: " + mPendingWakeupAction);