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

Commit 7ae51035 authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Unregister for posture callback on destroy 

To prevent a memory leak

Test: atest DozeTriggersTest DozeSensorsTest
Fixes: 218886701

Change-Id: I23debb6e0738521f1611f28250d48251fb0cf1a9
parent 82212e90

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

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ public class DozeSensors { 
        for (TriggerSensor triggerSensor : mTriggerSensors) {

            triggerSensor.setListening(false);

        }

        mProximitySensor.pause();

        mProximitySensor.destroy();



        mDevicePostureController.removeCallback(mDevicePostureCallback);

        mAuthController.removeCallback(mAuthControllerCallback);

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

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ public class DozeTriggers implements DozeMachine.Part { 
    @Override

    public void destroy() {

        mDozeSensors.destroy();

        mProxCheck.destroy();

    }



    private void onNotification(Runnable onPulseSuppressedListener) {

packages/SystemUI/src/com/android/systemui/util/sensors/PostureDependentProximitySensor.java

+14 −3
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ class PostureDependentProximitySensor extends ProximitySensorImpl { 
    private final ThresholdSensor[] mPostureToPrimaryProxSensorMap;

    private final ThresholdSensor[] mPostureToSecondaryProxSensorMap;



    private final DevicePostureController mDevicePostureController;



    @Inject

    PostureDependentProximitySensor(

            @PrimaryProxSensor ThresholdSensor[] postureToPrimaryProxSensorMap,
@@ -53,15 +55,24 @@ class PostureDependentProximitySensor extends ProximitySensorImpl { 
        );

        mPostureToPrimaryProxSensorMap = postureToPrimaryProxSensorMap;

        mPostureToSecondaryProxSensorMap = postureToSecondaryProxSensorMap;

        mDevicePosture = devicePostureController.getDevicePosture();

        devicePostureController.addCallback(mDevicePostureCallback);

        mDevicePostureController = devicePostureController;



        mDevicePosture = mDevicePostureController.getDevicePosture();

        mDevicePostureController.addCallback(mDevicePostureCallback);



        chooseSensors();

    }



    @Override

    public void destroy() {

        super.destroy();

        mDevicePostureController.removeCallback(mDevicePostureCallback);

    }



    private void chooseSensors() {

        if (mDevicePosture >= mPostureToPrimaryProxSensorMap.length

                || mDevicePosture >= mPostureToSecondaryProxSensorMap.length) {

            Log.e("PostureDependentProxSensor",

            Log.e("PostureDependProxSensor",

                    "unsupported devicePosture=" + mDevicePosture);

            return;

        }

packages/SystemUI/src/com/android/systemui/util/sensors/ProximityCheck.java

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ public class ProximityCheck implements Runnable { 
        }

    }



    /**

     * Cleanup after no longer needed.

     */

    public void destroy() {

        mSensor.destroy();

    }



    private void unregister() {

        mSensor.unregister(mListener);

        mRegistered.set(false);

packages/SystemUI/src/com/android/systemui/util/sensors/ProximitySensor.java

+6 −0
Original line number Diff line number Diff line
@@ -42,4 +42,10 @@ public interface ProximitySensor extends ThresholdSensor { 
     * of what is reported by the primary sensor.

     */

    void setSecondarySafe(boolean safe);



    /**

     * Called when the proximity sensor is no longer needed. All listeners should

     * be unregistered and cleaned up.

     */

    void destroy();

}