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

Merge "Fix synchronization for BlurController.mBlurEnabled" into sc-dev

Browse Source
This commit is contained in:
Galia Peycheva
2021-04-26 15:10:44 +00:00
committed by Android (Google) Code Review
parent 5d1ebc4f96 460ce763eb
commit 49305fdbe6
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/BlurController.java
View File

@@ -30,8 +30,6 @@ import android.os.RemoteException;
import android.provider.Settings;
import android.view.ICrossWindowBlurEnabledListener;
import com.android.internal.annotations.GuardedBy;
/**
* Keeps track of the different factors that determine whether cross-window blur is enabled
* or disabled. Also keeps a list of all interested listeners and notifies them when the
@@ -44,8 +42,7 @@ final class BlurController {
// We don't use the WM global lock, because the BlurController is not involved in window
// drawing and only receives binder calls that don't need synchronization with the rest of WM
private final Object mLock = new Object();
@GuardedBy("mLock")
boolean mBlurEnabled;
private volatile boolean mBlurEnabled;
private boolean mInPowerSaveMode;
private boolean mBlurDisabledSetting;
@@ -87,9 +84,7 @@ final class BlurController {
boolean registerCrossWindowBlurEnabledListener(ICrossWindowBlurEnabledListener listener) {
if (listener == null) return false;
mBlurEnabledListeners.register(listener);
synchronized (mLock) {
return mBlurEnabled;
}
return getBlurEnabled();
}
void unregisterCrossWindowBlurEnabledListener(ICrossWindowBlurEnabledListener listener) {
@@ -97,6 +92,10 @@ final class BlurController {
mBlurEnabledListeners.unregister(listener);
}
boolean getBlurEnabled() {
return mBlurEnabled;
}
private void updateBlurEnabled() {
synchronized (mLock) {
final boolean newEnabled = CROSS_WINDOW_BLUR_SUPPORTED && !mBlurDisabledSetting

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -6292,7 +6292,7 @@ public class WindowManagerService extends IWindowManager.Stub
}
});
pw.print(" mInTouchMode="); pw.println(mInTouchMode);
pw.print(" mBlurEnabled="); pw.println(mBlurController.mBlurEnabled);
pw.print(" mBlurEnabled="); pw.println(mBlurController.getBlurEnabled());
pw.print(" mLastDisplayFreezeDuration=");
TimeUtils.formatDuration(mLastDisplayFreezeDuration, pw);
if ( mLastFinishedFreezeSource != null) {

2
services/core/java/com/android/server/wm/WindowManagerShellCommand.java
View File

@@ -217,7 +217,7 @@ public class WindowManagerShellCommand extends ShellCommand {
String arg = getNextArg();
if (arg == null) {
pw.println("Blur supported on device: " + CROSS_WINDOW_BLUR_SUPPORTED);
pw.println("Blur enabled: " + mInternal.mBlurController.mBlurEnabled);
pw.println("Blur enabled: " + mInternal.mBlurController.getBlurEnabled());
return 0;
}

3
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5354,7 +5354,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}
private boolean shouldDrawBlurBehind() {
return (mAttrs.flags & FLAG_BLUR_BEHIND) != 0 && mWmService.mBlurController.mBlurEnabled;
return (mAttrs.flags & FLAG_BLUR_BEHIND) != 0
&& mWmService.mBlurController.getBlurEnabled();
}
/**