Merge "Don't tell anyone how I debug :(" into tm-dev am: 018eec54e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730888 Change-Id: I63c5c5dd4dd28ec7feaae3142f92110178257171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -31,8 +31,6 @@ import android.provider.Settings;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.MathUtils;
|
import android.util.MathUtils;
|
||||||
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
|
||||||
@@ -293,11 +291,6 @@ public class DozeParameters implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void updateControlScreenOff() {
|
public void updateControlScreenOff() {
|
||||||
Log.i("TEST", "Display needs blanking?" + getDisplayNeedsBlanking());
|
|
||||||
Log.i("TEST", "Should control screen off?" + shouldControlUnlockedScreenOff());
|
|
||||||
Log.i("TEST", "alwaysOn?" + getAlwaysOn());
|
|
||||||
Log.i("TEST", "keyguard showing?" + mKeyguardShowing);
|
|
||||||
Log.i("TEST", "Flag enabled? " + mFeatureFlags.isEnabled(Flags.LOCKSCREEN_ANIMATIONS));
|
|
||||||
if (!getDisplayNeedsBlanking()) {
|
if (!getDisplayNeedsBlanking()) {
|
||||||
final boolean controlScreenOff =
|
final boolean controlScreenOff =
|
||||||
getAlwaysOn() && (mKeyguardShowing || shouldControlUnlockedScreenOff());
|
getAlwaysOn() && (mKeyguardShowing || shouldControlUnlockedScreenOff());
|
||||||
|
|||||||
Reference in New Issue
Block a user