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

Merge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2015-06-12 00:39:28 +00:00
committed by Android (Google) Code Review
parent d46733556b 92af789d85
commit a8a0ac6940
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5919,11 +5919,15 @@ public class WindowManagerService extends IWindowManager.Stub
if (mContext.getResources().getConfiguration().isScreenRound() if (mContext.getResources().getConfiguration().isScreenRound()
&& mContext.getResources().getBoolean( && mContext.getResources().getBoolean(
com.android.internal.R.bool.config_windowShowCircularMask)) { com.android.internal.R.bool.config_windowShowCircularMask)) {
final int currentUserId;
synchronized(mWindowMap) {
currentUserId = mCurrentUserId;
}
// Device configuration calls for a circular display mask, but we only enable the mask // Device configuration calls for a circular display mask, but we only enable the mask
// if the accessibility color inversion feature is disabled, as the inverted mask // if the accessibility color inversion feature is disabled, as the inverted mask
// causes artifacts. // causes artifacts.
int inversionState = Settings.Secure.getIntForUser(mContext.getContentResolver(), int inversionState = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, mCurrentUserId); Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, 0, currentUserId);
int showMask = (inversionState == 1) ? 0 : 1; int showMask = (inversionState == 1) ? 0 : 1;
Message m = mH.obtainMessage(H.SHOW_CIRCULAR_DISPLAY_MASK); Message m = mH.obtainMessage(H.SHOW_CIRCULAR_DISPLAY_MASK);
m.arg1 = showMask; m.arg1 = showMask;
@@ -7424,10 +7428,10 @@ public class WindowManagerService extends IWindowManager.Stub
} }
public void updateShowImeWithHardKeyboard() { public void updateShowImeWithHardKeyboard() {
synchronized (mWindowMap) {
final boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser( final boolean showImeWithHardKeyboard = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0, mContext.getContentResolver(), Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD, 0,
mCurrentUserId) == 1; mCurrentUserId) == 1;
synchronized (mWindowMap) {
if (mShowImeWithHardKeyboard != showImeWithHardKeyboard) { if (mShowImeWithHardKeyboard != showImeWithHardKeyboard) {
mShowImeWithHardKeyboard = showImeWithHardKeyboard; mShowImeWithHardKeyboard = showImeWithHardKeyboard;
mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION); mH.sendEmptyMessage(H.SEND_NEW_CONFIGURATION);