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

Merge "Remove usage of sleep tokens during dreams" into rvc-dev am: 2de83af6b1 am: a3d50422c2

Browse Source 
Change-Id: I2acbd100531d66cd10080924ebdf96405f8a98b9
This commit is contained in:
Galia Peycheva
2020-03-24 18:22:54 +00:00
committed by Automerger Merge Worker
parent 6c474bf781 a3d50422c2
commit 92c2899a10
1 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -115,7 +115,6 @@ import static com.android.server.policy.WindowManagerPolicy.TRANSIT_HIDE;
import static com.android.server.policy.WindowManagerPolicy.TRANSIT_PREVIEW_DONE; import static com.android.server.policy.WindowManagerPolicy.TRANSIT_PREVIEW_DONE;
import static com.android.server.policy.WindowManagerPolicy.TRANSIT_SHOW; import static com.android.server.policy.WindowManagerPolicy.TRANSIT_SHOW;
import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT; import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.LID_ABSENT;
import static com.android.server.wm.ActivityTaskManagerInternal.SleepToken;
import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_SCREEN_ON; import static com.android.server.wm.ProtoLogGroup.WM_DEBUG_SCREEN_ON;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT; import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT;
@@ -178,7 +177,6 @@ import android.view.WindowManagerPolicyConstants;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.policy.GestureNavigationSettingsObserver; import com.android.internal.policy.GestureNavigationSettingsObserver;
import com.android.internal.policy.ScreenDecorationsUtils; import com.android.internal.policy.ScreenDecorationsUtils;
@@ -333,9 +331,6 @@ public class DisplayPolicy {
} }
}; };
@GuardedBy("mHandler")
private SleepToken mDreamingSleepToken;
// The windows we were told about in focusChanged. // The windows we were told about in focusChanged.
private WindowState mFocusedWindow; private WindowState mFocusedWindow;
private WindowState mLastFocusedWindow; private WindowState mLastFocusedWindow;
@@ -394,7 +389,6 @@ public class DisplayPolicy {
private boolean mShowingDream; private boolean mShowingDream;
private boolean mLastShowingDream; private boolean mLastShowingDream;
private boolean mDreamingLockscreen; private boolean mDreamingLockscreen;
private boolean mDreamingSleepTokenNeeded;
private boolean mAllowLockscreenWhenOn; private boolean mAllowLockscreenWhenOn;
private InputConsumer mInputConsumer = null; private InputConsumer mInputConsumer = null;
@@ -414,7 +408,6 @@ public class DisplayPolicy {
private RefreshRatePolicy mRefreshRatePolicy; private RefreshRatePolicy mRefreshRatePolicy;
// -------- PolicyHandler -------- // -------- PolicyHandler --------
private static final int MSG_UPDATE_DREAMING_SLEEP_TOKEN = 1;
private static final int MSG_REQUEST_TRANSIENT_BARS = 2; private static final int MSG_REQUEST_TRANSIENT_BARS = 2;
private static final int MSG_DISPOSE_INPUT_CONSUMER = 3; private static final int MSG_DISPOSE_INPUT_CONSUMER = 3;
private static final int MSG_ENABLE_POINTER_LOCATION = 4; private static final int MSG_ENABLE_POINTER_LOCATION = 4;
@@ -434,9 +427,6 @@ public class DisplayPolicy {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
switch (msg.what) { switch (msg.what) {
case MSG_UPDATE_DREAMING_SLEEP_TOKEN:
updateDreamingSleepToken(msg.arg1 != 0);
break;
case MSG_REQUEST_TRANSIENT_BARS: case MSG_REQUEST_TRANSIENT_BARS:
synchronized (mLock) { synchronized (mLock) {
WindowState targetBar = (msg.arg1 == MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS) WindowState targetBar = (msg.arg1 == MSG_REQUEST_TRANSIENT_BARS_ARG_STATUS)
@@ -2638,15 +2628,6 @@ public class DisplayPolicy {
// while the dream is showing. // while the dream is showing.
if (!mShowingDream) { if (!mShowingDream) {
mDreamingLockscreen = mService.mPolicy.isKeyguardShowingAndNotOccluded(); mDreamingLockscreen = mService.mPolicy.isKeyguardShowingAndNotOccluded();
if (mDreamingSleepTokenNeeded) {
mDreamingSleepTokenNeeded = false;
mHandler.obtainMessage(MSG_UPDATE_DREAMING_SLEEP_TOKEN, 0, 1).sendToTarget();
}
} else {
if (!mDreamingSleepTokenNeeded) {
mDreamingSleepTokenNeeded = true;
mHandler.obtainMessage(MSG_UPDATE_DREAMING_SLEEP_TOKEN, 1, 1).sendToTarget();
}
} }
if (mStatusBar != null) { if (mStatusBar != null) {
@@ -3160,21 +3141,6 @@ public class DisplayPolicy {
return !mShowingDream; return !mShowingDream;
} }
private void updateDreamingSleepToken(boolean acquire) {
if (acquire) {
final int displayId = getDisplayId();
if (mDreamingSleepToken == null) {
mDreamingSleepToken = mService.mAtmInternal.acquireSleepToken(
"DreamOnDisplay" + displayId, displayId);
}
} else {
if (mDreamingSleepToken != null) {
mDreamingSleepToken.release();
mDreamingSleepToken = null;
}
}
}
private void requestTransientBars(WindowState swipeTarget) { private void requestTransientBars(WindowState swipeTarget) {
if (!mService.mPolicy.isUserSetupComplete()) { if (!mService.mPolicy.isUserSetupComplete()) {
// Swipe-up for navigation bar is disabled during setup // Swipe-up for navigation bar is disabled during setup
@@ -3854,7 +3820,6 @@ public class DisplayPolicy {
} }
pw.print(prefix); pw.print("mShowingDream="); pw.print(mShowingDream); pw.print(prefix); pw.print("mShowingDream="); pw.print(mShowingDream);
pw.print(" mDreamingLockscreen="); pw.print(mDreamingLockscreen); pw.print(" mDreamingLockscreen="); pw.print(mDreamingLockscreen);
pw.print(" mDreamingSleepToken="); pw.println(mDreamingSleepToken);
if (mStatusBar != null) { if (mStatusBar != null) {
pw.print(prefix); pw.print("mStatusBar="); pw.print(mStatusBar); pw.print(prefix); pw.print("mStatusBar="); pw.print(mStatusBar);
} }