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

Commit ac798f27 authored by lpeter's avatar lpeter
Browse files

Fixes NullPointerException for DockManager.

To check if DockManager component is null or not before using.

Bug: 124136994
Test: atest SystemUIGoogleTests
Test: manual
Change-Id: Ifa7dfc5b8035f647ff679995df94fbde6fdbfdf2
parent 5ab3e661
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -161,7 +161,8 @@ public class DozeTriggers implements DozeMachine.Part {
                } else {
                    mDozeHost.extendPulse();
                }
            }, sensorPerformedProxCheck || mDockManager.isDocked(), pulseReason);
            }, sensorPerformedProxCheck
                    || (mDockManager != null && mDockManager.isDocked()), pulseReason);
        }

        if (isPickup) {
@@ -224,7 +225,9 @@ public class DozeTriggers implements DozeMachine.Part {
            case INITIALIZED:
                mBroadcastReceiver.register(mContext);
                mDozeHost.addCallback(mHostCallback);
                if (mDockManager != null) {
                    mDockManager.addListener(mDockEventListener);
                }
                checkTriggersAtInit();
                break;
            case DOZE:
@@ -250,7 +253,9 @@ public class DozeTriggers implements DozeMachine.Part {
            case FINISH:
                mBroadcastReceiver.unregister(mContext);
                mDozeHost.removeCallback(mHostCallback);
                if (mDockManager != null) {
                    mDockManager.removeListener(mDockEventListener);
                }
                mDozeSensors.setListening(false);
                mDozeSensors.setProxListening(false);
                break;