Merge "Fix the NPE crash when device reboot with hide cutout set" into tm-qpr-dev (9d4ac70a) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/hidedisplaycutout/HideDisplayCutoutOrganizer.java

+27 −19

Original line number	Original line	Diff line number	Diff line
	@@ -64,8 +64,8 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer {
	@VisibleForTesting		@VisibleForTesting
	final Rect mCurrentDisplayBounds = new Rect();		final Rect mCurrentDisplayBounds = new Rect();
	// The default display cutout in natural orientation.		// The default display cutout in natural orientation.
	private Insets mDefaultCutoutInsets;		private Insets mDefaultCutoutInsets = Insets.NONE;
	private Insets mCurrentCutoutInsets;		private Insets mCurrentCutoutInsets = Insets.NONE;
	private boolean mIsDefaultPortrait;		private boolean mIsDefaultPortrait;
	private int mStatusBarHeight;		private int mStatusBarHeight;
	@VisibleForTesting		@VisibleForTesting
	@@ -77,13 +77,22 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer {

	private final DisplayController.OnDisplaysChangedListener mListener =		private final DisplayController.OnDisplaysChangedListener mListener =
	new DisplayController.OnDisplaysChangedListener() {		new DisplayController.OnDisplaysChangedListener() {
			@Override
			public void onDisplayAdded(int displayId) {
			onDisplayChanged(displayId);
			}

	@Override		@Override
	public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {		public void onDisplayConfigurationChanged(int displayId, Configuration newConfig) {
			onDisplayChanged(displayId);
			}
			};

			private void onDisplayChanged(int displayId) {
	if (displayId != DEFAULT_DISPLAY) {		if (displayId != DEFAULT_DISPLAY) {
	return;		return;
	}		}
	DisplayLayout displayLayout =		final DisplayLayout displayLayout = mDisplayController.getDisplayLayout(DEFAULT_DISPLAY);
	mDisplayController.getDisplayLayout(DEFAULT_DISPLAY);
	if (displayLayout == null) {		if (displayLayout == null) {
	return;		return;
	}		}
	@@ -97,7 +106,6 @@ class HideDisplayCutoutOrganizer extends DisplayAreaOrganizer {
	applyTransaction(wct, t);		applyTransaction(wct, t);
	}		}
	}		}
	};

	HideDisplayCutoutOrganizer(Context context, DisplayController displayController,		HideDisplayCutoutOrganizer(Context context, DisplayController displayController,
	ShellExecutor mainExecutor) {		ShellExecutor mainExecutor) {