Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Nullcheck for StatusBarManagerInternal in InsetsPolicy"

Browse Source
This commit is contained in:
Josh Yang
2021-06-28 16:47:41 +00:00
committed by Android (Google) Code Review
parent 69c2c783c5 7f00ac7f25
commit 068767db20
2 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -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) {

32
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -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,8 +484,12 @@ class InsetsPolicy {
final int state = visible ? WINDOW_STATE_SHOWING : WINDOW_STATE_HIDDEN;
if (mState != state) {
mState = state;
mPolicy.getStatusBarManagerInternal().setWindowState(
mDisplayContent.getDisplayId(), mId, state);
StatusBarManagerInternal statusBarManagerInternal =
mPolicy.getStatusBarManagerInternal();
if (statusBarManagerInternal != null) {
statusBarManagerInternal.setWindowState(
mDisplayContent.getDisplayId(), mId, state);
}
}
}
}