Merge "Fix NPE" into tm-qpr-dev am: 7ade0dddff am: cbf94cb4fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20727866

Change-Id: Ieac0d6f60c430f1dfb30e38947aa43d8ead04f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Weir
2022-12-16 21:20:35 +00:00
committed by Automerger Merge Worker

View File

@@ -1305,8 +1305,10 @@ public class NavigationBar extends ViewController<NavigationBarView> implements
}
private void onVerticalChanged(boolean isVertical) {
mCentralSurfacesOptionalLazy.get().ifPresent(statusBar ->
statusBar.getNotificationPanelViewController().setQsScrimEnabled(!isVertical));
Optional<CentralSurfaces> cs = mCentralSurfacesOptionalLazy.get();
if (cs.isPresent() && cs.get().getNotificationPanelViewController() != null) {
cs.get().getNotificationPanelViewController().setQsScrimEnabled(!isVertical);
}
}
private boolean onNavigationTouch(View v, MotionEvent event) {