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

Merge "Fix a deadlock WMG->WMS, WMS->WMG" into qt-dev

Browse Source
This commit is contained in:
NT Tsai
2019-04-16 02:27:02 +00:00
committed by Android (Google) Code Review
parent 8540e63dec a236354047
commit 4d39c62169
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/wm/ImmersiveModeConfirmation.java
View File

@@ -90,8 +90,6 @@ public class ImmersiveModeConfirmation {
mShowDelayMs = getNavBarExitDuration() * 3; mShowDelayMs = getNavBarExitDuration() * 3;
mPanicThresholdMs = context.getResources() mPanicThresholdMs = context.getResources()
.getInteger(R.integer.config_immersive_mode_confirmation_panic); .getInteger(R.integer.config_immersive_mode_confirmation_panic);
mWindowManager = (WindowManager)
mContext.getSystemService(Context.WINDOW_SERVICE);
mVrModeEnabled = vrModeEnabled; mVrModeEnabled = vrModeEnabled;
} }
@@ -177,7 +175,7 @@ public class ImmersiveModeConfirmation {
private void handleHide() { private void handleHide() {
if (mClingWindow != null) { if (mClingWindow != null) {
if (DEBUG) Slog.d(TAG, "Hiding immersive mode confirmation"); if (DEBUG) Slog.d(TAG, "Hiding immersive mode confirmation");
mWindowManager.removeView(mClingWindow); getWindowManager().removeView(mClingWindow);
mClingWindow = null; mClingWindow = null;
} }
} }
@@ -275,7 +273,7 @@ public class ImmersiveModeConfirmation {
super.onAttachedToWindow(); super.onAttachedToWindow();
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
mWindowManager.getDefaultDisplay().getMetrics(metrics); getWindowManager().getDefaultDisplay().getMetrics(metrics);
float density = metrics.density; float density = metrics.density;
getViewTreeObserver().addOnComputeInternalInsetsListener(mInsetsListener); getViewTreeObserver().addOnComputeInternalInsetsListener(mInsetsListener);
@@ -341,6 +339,19 @@ public class ImmersiveModeConfirmation {
} }
} }
/**
* DO HOLD THE WINDOW MANAGER LOCK WHEN CALLING THIS METHOD
* The reason why we add this method is to avoid the deadlock of WMG->WMS and WMS->WMG
* when ImmersiveModeConfirmation object is created.
*/
private WindowManager getWindowManager() {
if (mWindowManager == null) {
mWindowManager = (WindowManager)
mContext.getSystemService(Context.WINDOW_SERVICE);
}
return mWindowManager;
}
private void handleShow() { private void handleShow() {
if (DEBUG) Slog.d(TAG, "Showing immersive mode confirmation"); if (DEBUG) Slog.d(TAG, "Showing immersive mode confirmation");
@@ -352,7 +363,7 @@ public class ImmersiveModeConfirmation {
// show the confirmation // show the confirmation
WindowManager.LayoutParams lp = getClingWindowLayoutParams(); WindowManager.LayoutParams lp = getClingWindowLayoutParams();
mWindowManager.addView(mClingWindow, lp); getWindowManager().addView(mClingWindow, lp);
} }
private final Runnable mConfirm = new Runnable() { private final Runnable mConfirm = new Runnable() {