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

Commit 499606e9 authored by Adrian Roos's avatar Adrian Roos
Browse files

WM: Fix WindowManagerConstants initialization order 

Test: boots
Fixes: 144958282
Change-Id: Ib58a48a951dad30f5b3f86544f92ff2825db3f3a
parent 79839058

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

+4 −2
Original line number 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_GESTURE_EXCLUSION_LIMIT_DP;



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



import android.provider.AndroidDeviceConfig;

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

            Runnable updateSystemGestureExclusionCallback,

            DeviceConfigInterface deviceConfig) {

        mGlobalLock = globalLock;

        mUpdateSystemGestureExclusionCallback = updateSystemGestureExclusionCallback;

        mGlobalLock = checkNotNull(globalLock);

        mUpdateSystemGestureExclusionCallback = checkNotNull(updateSystemGestureExclusionCallback);

        mDeviceConfig = deviceConfig;

        mListenerAndroid = this::onAndroidPropertiesChanged;

        mListenerWindowManager = this::onWindowPropertiesChanged;

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

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


    private static final int ANIMATION_COMPLETED_TIMEOUT_MS = 5000;



    final WindowManagerConstants mConstants = new WindowManagerConstants(this,

            DeviceConfigInterface.REAL);

    final WindowManagerConstants mConstants;



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


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



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

        mConstants.start(new HandlerExecutor(mH));



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