Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8a0ac69 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

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

parents d4673355 92af789d

services/core/java/com/android/server/wm/WindowManagerService.java

+8 −4
Original line number Original line Diff line number Diff line
@@ -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);