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

Commit 675b6a8c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WM: Fix WindowManagerConstants initialization order"

parents 2a356651 499606e9

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.server.wm; 
import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE;

import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURES_EXCLUDED_BY_PRE_Q_STICKY_IMMERSIVE;

import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP;

import static android.provider.AndroidDeviceConfig.KEY_SYSTEM_GESTURE_EXCLUSION_LIMIT_DP;





import static com.android.internal.util.Preconditions.checkNotNull;



import android.provider.AndroidDeviceConfig;

import android.provider.AndroidDeviceConfig;

import android.provider.DeviceConfig;

import android.provider.DeviceConfig;
@@ -72,8 +74,8 @@ final class WindowManagerConstants { 
    WindowManagerConstants(WindowManagerGlobalLock globalLock,

    WindowManagerConstants(WindowManagerGlobalLock globalLock,

            Runnable updateSystemGestureExclusionCallback,

            Runnable updateSystemGestureExclusionCallback,

            DeviceConfigInterface deviceConfig) {

            DeviceConfigInterface deviceConfig) {

        mGlobalLock = globalLock;

        mGlobalLock = checkNotNull(globalLock);

        mUpdateSystemGestureExclusionCallback = updateSystemGestureExclusionCallback;

        mUpdateSystemGestureExclusionCallback = checkNotNull(updateSystemGestureExclusionCallback);

        mDeviceConfig = deviceConfig;

        mDeviceConfig = deviceConfig;

        mListenerAndroid = this::onAndroidPropertiesChanged;

        mListenerAndroid = this::onAndroidPropertiesChanged;

        mListenerWindowManager = this::onWindowPropertiesChanged;

        mListenerWindowManager = this::onWindowPropertiesChanged;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -405,8 +405,7 @@ public class WindowManagerService extends IWindowManager.Stub 




    private static final int ANIMATION_COMPLETED_TIMEOUT_MS = 5000;

    private static final int ANIMATION_COMPLETED_TIMEOUT_MS = 5000;





    final WindowManagerConstants mConstants = new WindowManagerConstants(this,

    final WindowManagerConstants mConstants;

            DeviceConfigInterface.REAL);





    final WindowTracing mWindowTracing;

    final WindowTracing mWindowTracing;
@@ -1232,6 +1231,7 @@ public class WindowManagerService extends IWindowManager.Stub 




        mHighRefreshRateBlacklist = HighRefreshRateBlacklist.create(context.getResources());

        mHighRefreshRateBlacklist = HighRefreshRateBlacklist.create(context.getResources());





        mConstants = new WindowManagerConstants(this, DeviceConfigInterface.REAL);

        mConstants.start(new HandlerExecutor(mH));

        mConstants.start(new HandlerExecutor(mH));





        LocalServices.addService(WindowManagerInternal.class, new LocalService());

        LocalServices.addService(WindowManagerInternal.class, new LocalService());