Merge "Nullcheck for StatusBarManagerInternal in InsetsPolicy" (068767db) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -2240,7 +2240,10 @@ public class DisplayPolicy {
		void notifyDisplayReady() {
		mHandler.post(() -> {
		final int displayId = getDisplayId();
		getStatusBarManagerInternal().onDisplayReady(displayId);
		StatusBarManagerInternal statusBar = getStatusBarManagerInternal();
		if (statusBar != null) {
		statusBar.onDisplayReady(displayId);
		}
		final WallpaperManagerInternal wpMgr = LocalServices
		.getService(WallpaperManagerInternal.class);
		if (wpMgr != null) {

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

+23 −9

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ import android.view.WindowManager;
		import com.android.internal.R;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.DisplayThread;
		import com.android.server.statusbar.StatusBarManagerInternal;

		/**
		* Policy that implements who gets control over the windows generating insets.
		@@ -167,8 +168,12 @@ class InsetsPolicy {
		changed = true;
		}
		if (changed) {
		mPolicy.getStatusBarManagerInternal().showTransient(mDisplayContent.getDisplayId(),
		mShowingTransientTypes.toArray());
		StatusBarManagerInternal statusBarManagerInternal =
		mPolicy.getStatusBarManagerInternal();
		if (statusBarManagerInternal != null) {
		statusBarManagerInternal.showTransient(
		mDisplayContent.getDisplayId(), mShowingTransientTypes.toArray());
		}
		updateBarControlTarget(mFocusedWin);

		// The leashes can be created while updating bar control target. The surface transaction
		@@ -282,9 +287,11 @@ class InsetsPolicy {
		abortTypes.add(type);
		}
		}
		if (abortTypes.size() > 0) {
		mPolicy.getStatusBarManagerInternal().abortTransient(mDisplayContent.getDisplayId(),
		abortTypes.toArray());
		StatusBarManagerInternal statusBarManagerInternal =
		mPolicy.getStatusBarManagerInternal();
		if (abortTypes.size() > 0 && statusBarManagerInternal != null) {
		statusBarManagerInternal.abortTransient(
		mDisplayContent.getDisplayId(), abortTypes.toArray());
		}
		}
		}
		@@ -294,8 +301,11 @@ class InsetsPolicy {
		* updateBarControlTarget(mFocusedWin) after this invocation.
		*/
		private void abortTransient() {
		mPolicy.getStatusBarManagerInternal().abortTransient(mDisplayContent.getDisplayId(),
		mShowingTransientTypes.toArray());
		StatusBarManagerInternal statusBarManagerInternal = mPolicy.getStatusBarManagerInternal();
		if (statusBarManagerInternal != null) {
		statusBarManagerInternal.abortTransient(
		mDisplayContent.getDisplayId(), mShowingTransientTypes.toArray());
		}
		mShowingTransientTypes.clear();
		}

		@@ -474,11 +484,15 @@ class InsetsPolicy {
		final int state = visible ? WINDOW_STATE_SHOWING : WINDOW_STATE_HIDDEN;
		if (mState != state) {
		mState = state;
		mPolicy.getStatusBarManagerInternal().setWindowState(
		StatusBarManagerInternal statusBarManagerInternal =
		mPolicy.getStatusBarManagerInternal();
		if (statusBarManagerInternal != null) {
		statusBarManagerInternal.setWindowState(
		mDisplayContent.getDisplayId(), mId, state);
		}
		}
		}
		}

		private class InsetsPolicyAnimationControlListener extends
		InsetsController.InternalAnimationControlListener {