Merge "Don't tell anyone how I debug :(" into tm-dev am: 018eec54e1 am: 39f49d4e6f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17730888

Change-Id: I8ad23f4ec7a32722df9cf0e470a3bcfff8783b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-13 22:51:28 +00:00
committed by Automerger Merge Worker

View File

@@ -31,8 +31,6 @@ import android.provider.Settings;
import android.util.Log;
import android.util.MathUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -293,11 +291,6 @@ public class DozeParameters implements
}
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()) {
final boolean controlScreenOff =
getAlwaysOn() && (mKeyguardShowing || shouldControlUnlockedScreenOff());