diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayContent.java | 47 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/DisplayPolicy.java | 1 |
2 files changed, 7 insertions, 41 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index 919dd387e240..ecf2787a2080 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -164,7 +164,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; import android.app.ActivityManagerInternal; -import android.content.ComponentCallbacks; import android.content.ComponentName; import android.content.Context; import android.content.pm.ActivityInfo; @@ -471,7 +470,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp private DisplayInfo mLastDisplayInfoOverride; private final DisplayMetrics mDisplayMetrics = new DisplayMetrics(); - @NonNull private final DisplayPolicy mDisplayPolicy; private final DisplayRotation mDisplayRotation; @@ -558,7 +556,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp /** Remove this display when animation on it has completed. */ private boolean mDeferredRemoval; - @NonNull final PinnedTaskController mPinnedTaskController; private final LinkedList<ActivityRecord> mTmpUpdateAllDrawn = new LinkedList(); @@ -1119,29 +1116,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp }; /** - * Called to update fields retrieve from {@link #getDisplayUiContext()} resources when - * there's a configuration update on {@link #getDisplayUiContext()}. - */ - @NonNull - private final ComponentCallbacks mSysUiContextConfigCallback = new ComponentCallbacks() { - - @Override - public void onConfigurationChanged(@NonNull Configuration newConfig) { - synchronized (mWmService.mGlobalLock) { - if (mDisplayReady) { - mDisplayPolicy.onConfigurationChanged(); - mMinSizeOfResizeableTaskDp = getMinimalTaskSizeDp(); - } - } - } - - @Override - public void onLowMemory() { - // Do nothing. - } - }; - - /** * Create new {@link DisplayContent} instance, add itself to the root window container and * initialize direct children. * @param display May not be null. @@ -2849,10 +2823,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp final int lastOrientation = getConfiguration().orientation; final int lastWindowingMode = getWindowingMode(); super.onConfigurationChanged(newParentConfig); - if (!Flags.trackSystemUiContextBeforeWms()) { - mSysUiContextConfigCallback.onConfigurationChanged(newParentConfig); + if (mDisplayPolicy != null) { + mDisplayPolicy.onConfigurationChanged(); + mPinnedTaskController.onPostDisplayConfigurationChanged(); + mMinSizeOfResizeableTaskDp = getMinimalTaskSizeDp(); } - mPinnedTaskController.onPostDisplayConfigurationChanged(); // Update IME parent if needed. updateImeParent(); @@ -3413,9 +3388,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp .getKeyguardController().onDisplayRemoved(mDisplayId); mWallpaperController.resetLargestDisplay(mDisplay); mWmService.mDisplayWindowSettings.onDisplayRemoved(this); - if (Flags.trackSystemUiContextBeforeWms()) { - getDisplayUiContext().unregisterComponentCallbacks(mSysUiContextConfigCallback); - } } finally { mDisplayReady = false; } @@ -5512,7 +5484,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp reconfigureDisplayLocked(); onRequestedOverrideConfigurationChanged(getRequestedOverrideConfiguration()); mWmService.mDisplayNotificationController.dispatchDisplayAdded(this); - // Attach the SystemUiContext to this DisplayContent to get latest configuration. + // Attach the SystemUiContext to this DisplayContent the get latest configuration. // Note that the SystemUiContext will be removed automatically if this DisplayContent // is detached. registerSystemUiContext(); @@ -5520,15 +5492,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp } private void registerSystemUiContext() { - final Context systemUiContext = getDisplayUiContext(); final WindowProcessController wpc = mAtmService.getProcessController( - systemUiContext.getIApplicationThread()); + getDisplayUiContext().getIApplicationThread()); mWmService.mWindowContextListenerController.registerWindowContainerListener( - wpc, systemUiContext.getWindowContextToken(), this, + wpc, getDisplayUiContext().getWindowContextToken(), this, INVALID_WINDOW_TYPE, null /* options */); - if (Flags.trackSystemUiContextBeforeWms()) { - systemUiContext.registerComponentCallbacks(mSysUiContextConfigCallback); - } } @Override @@ -6721,7 +6689,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp forAllTasks((t) -> { t.getRootTask().removeChild(t, "removeAllTasks"); }); } - @NonNull Context getDisplayUiContext() { return mDisplayPolicy.getSystemUiContext(); } diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java index fbe850198c50..10f591cfd379 100644 --- a/services/core/java/com/android/server/wm/DisplayPolicy.java +++ b/services/core/java/com/android/server/wm/DisplayPolicy.java @@ -1865,7 +1865,6 @@ public class DisplayPolicy { return mContext; } - @NonNull Context getSystemUiContext() { return mUiContext; } |