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

Commit 75bda69b authored by Abhishek Gadewar's avatar Abhishek Gadewar
Browse files

Add null-checks to an optional dream service 



Summary: Adding null check when dream service is disabled.

Test: build passes

Change-Id: I0860fb804b3eb2d7c43d871eed49046baedca7c4
Signed-off-by: default avatarAbhishek Gadewar <abhishekgadewar@meta.com>
parent 30028ce0

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+3 −2
Original line number Diff line number Diff line
@@ -176,9 +176,10 @@ public class KeyguardServiceDelegate { 


        final DreamManagerInternal dreamManager =

                LocalServices.getService(DreamManagerInternal.class);



        if(dreamManager != null){

            dreamManager.registerDreamManagerStateListener(mDreamManagerStateListener);

        }

    }



    private final ServiceConnection mKeyguardConnection = new ServiceConnection() {

        @Override

services/core/java/com/android/server/power/PowerManagerService.java

+5 −3
Original line number Diff line number Diff line
@@ -1359,8 +1359,10 @@ public final class PowerManagerService extends SystemService 
                    new DisplayGroupPowerChangeListener();

            mDisplayManagerInternal.registerDisplayGroupListener(displayGroupPowerChangeListener);



            if(mDreamManager != null){

                // This DreamManager method does not acquire a lock, so it should be safe to call.

                mDreamManager.registerDreamManagerStateListener(new DreamManagerStateListener());

            }



            mWirelessChargerDetector = mInjector.createWirelessChargerDetector(sensorManager,

                    mInjector.createSuspendBlocker(
@@ -3466,7 +3468,7 @@ public final class PowerManagerService extends SystemService 
        }



        // Stop dream.

        if (isDreaming) {

        if (isDreaming && mDreamManager != null) {

            mDreamManager.stopDream(/* immediate= */ false, "power manager request" /*reason*/);

        }

    }