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

Commit 79d81ab2 authored by Galia Peycheva's avatar Galia Peycheva Committed by Android (Google) Code Review
Browse files

Merge "Fix NullPointerException in DreamManagerService"

parents 142dcfb1 34320067

services/core/java/com/android/server/dreams/DreamManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -416,13 +416,14 @@ public final class DreamManagerService extends SystemService { 
        mCurrentDreamCanDoze = canDoze;

        mCurrentDreamUserId = userId;



        if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {

            mUiEventLogger.log(DreamManagerEvent.DREAM_START);

        }



        PowerManager.WakeLock wakeLock = mPowerManager

                .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "startDream");

        mHandler.post(wakeLock.wrap(() -> {

            mAtmInternal.notifyDreamStateChanged(true);

            if (!mCurrentDreamName.equals(mAmbientDisplayComponent)) {

                mUiEventLogger.log(DreamManagerEvent.DREAM_START);

            }

            mController.startDream(newToken, name, isTest, canDoze, userId, wakeLock,

                    mDreamOverlayServiceName);

        }));