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

Nullcheck for StatusBarManagerInternal in InsetsPolicy

Browse Source 
Wear does not support StatusBarManagerService

Bug: 158866039
Test: salmon boots successfully
Change-Id: I76a44c4cbc0f8eeeda6b9c35b2c29ce87f0db8de
Merged-In: I76a44c4cbc0f8eeeda6b9c35b2c29ce87f0db8de
(cherry picked from commit 3d40a967c3c111e205f577ab96daf7f2b696ee3e)
(cherry picked from commit 7f00ac7f25)
This commit is contained in:
shreerag@google.com
2020-06-12 13:41:42 -07:00
committed by Tiger Huang
parent 4abf39e6da
commit 6426637598
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

@@ -2273,7 +2273,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

@@ -54,6 +54,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.
@@ -170,8 +171,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
@@ -306,9 +311,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());
}
}
}
@@ -318,8 +325,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();
}
@@ -478,8 +488,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);
}
}
}
}