Merge "Reduce unnecessary invocation of updateKeepClearAreas" into main (4c17d771) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -2956,7 +2956,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		void onDisplayChanged(DisplayContent dc) {
		super.onDisplayChanged(dc);
		updateSystemGestureExclusionLimit();
		updateKeepClearAreas();
		}

		void updateSystemGestureExclusionLimit() {
		@@ -4035,7 +4034,6 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}

		adjustForImeIfNeeded();
		updateKeepClearAreas();

		// We may need to schedule some toast windows to be removed. The toasts for an app that
		// does not have input focus are removed within a timeout to prevent apps to redress
		@@ -6156,6 +6154,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		Region touchableRegion = Region.obtain();
		w.getEffectiveTouchableRegion(touchableRegion);
		RegionUtils.forEachRect(touchableRegion, rect -> outUnrestricted.add(rect));
		touchableRegion.recycle();
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -224,7 +224,6 @@ class InsetsStateController {
		if (changed) {
		notifyInsetsChanged();
		mDisplayContent.updateSystemGestureExclusion();
		mDisplayContent.updateKeepClearAreas();
		mDisplayContent.getDisplayPolicy().updateSystemBarAttributes();
		}
		}