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

Commit 2c89ce00 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "Guard mLockscreen in NotificationLogger with correct lock." into main

parents 345fd7a6 40981bf7

packages/SystemUI/src/com/android/systemui/statusbar/notification/logging/NotificationLogger.java

+4 −2
Original line number Diff line number Diff line
@@ -276,14 +276,16 @@ public class NotificationLogger implements StateListener, CoreStartable { 
        }

    }



    @GuardedBy("mDozingLock")

    public void startNotificationLogging() {

        if (!mLogging) {

            mLogging = true;

            if (DEBUG) {

                Log.i(TAG, "startNotificationLogging");

            }

            boolean lockscreen = mLockscreen != null && mLockscreen;

            boolean lockscreen;

            synchronized (mDozingLock) {

                lockscreen = mLockscreen != null && mLockscreen;

            }

            mNotificationPanelLogger.logPanelShown(lockscreen, getVisibleNotifications());

            mListContainer.setChildLocationsChangedListener(this::onChildLocationsChanged);

            // Sometimes, the transition from lockscreenOrShadeVisible=false ->