diff options
| author | 2023-03-06 17:26:24 +0000 | |
|---|---|---|
| committer | 2023-03-06 17:26:24 +0000 | |
| commit | a9092f050495556ea2f0cdf9a9e14157a40b69f7 (patch) | |
| tree | 1403d3746b94e6c40814190a9b0b743ec1f8e297 | |
| parent | 7b66ed94d54abd522adda346ccc8cb364054b651 (diff) | |
| parent | 2880a3c45a7cb7b915800c69b43e541a6a6f72c6 (diff) | |
Merge "Fix crash due to missing CentralSurfaces" into tm-qpr-dev am: 5917ed1176 am: 2880a3c45a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21701387
Change-Id: I7f1d75922c92893d3b99f6bee204539b4f1d5211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java index 25ff308b46bb..019ca52107dd 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java @@ -631,7 +631,9 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis final NavigationBarView navBarView = mNavBarControllerLazy.get().getNavigationBarView(mContext.getDisplayId()); final NotificationPanelViewController panelController = - mCentralSurfacesOptionalLazy.get().get().getNotificationPanelViewController(); + mCentralSurfacesOptionalLazy.get() + .map(CentralSurfaces::getNotificationPanelViewController) + .orElse(null); if (SysUiState.DEBUG) { Log.d(TAG_OPS, "Updating sysui state flags: navBarFragment=" + navBarFragment + " navBarView=" + navBarView + " panelController=" + panelController); |