Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40180107 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Adding null check for mNotificationShadeView" into tm-dev am: 01b5cd29 

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

Change-Id: I6f42adf3a25e4bcf0ce039dc30c5409f314894de
parents 7ff2e9bf 01b5cd29

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java

+6 −4
Original line number Diff line number Diff line
@@ -386,12 +386,14 @@ public class NotificationShadeWindowControllerImpl implements NotificationShadeW 
            }

            visible = true;

        }

        if (mNotificationShadeView != null) {

            if (visible) {

                mNotificationShadeView.setVisibility(View.VISIBLE);

            } else {

                mNotificationShadeView.setVisibility(View.INVISIBLE);

            }

        }

    }



    private boolean isExpanded(State state) {

        return !state.mForceCollapsed && (state.isKeyguardShowingAndNotOccluded()