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

Commit 9fc40e52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes NullPointerException for DockManager."

parents 15c8c26e ac798f27

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+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;