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

Commit 14cdb170 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Ensure BrightnessTracker is only "start()"ed once 

Here, we use mStarted to ensure that we dont reregister any broadcast
recievers. This was happening because initialize() would be called for
each DPC (of which there is one per display). This would cause start()
and stop() each to be called multiple times - causing a crash. There is
only one BrightnessTracker per device, however it needs to be
initialized within DPC because we need an initial brightness value,
which the first-initialised DPC provides us with.

Test: atest BrightnessTrackerTest
Bug: 253267570
Change-Id: I8f2aa74f5938cb370e97bf55dd97823be2a32627
parent 5719bdc9

services/core/java/com/android/server/display/BrightnessTracker.java

+10 −0
Original line number Diff line number Diff line
@@ -220,6 +220,11 @@ public class BrightnessTracker { 
    }



    private void backgroundStart(float initialBrightness) {

        synchronized (mDataCollectionLock) {

            if (mStarted) {

                return;

            }

        }

        if (DEBUG) {

            Slog.d(TAG, "Background start");

        }
@@ -250,6 +255,11 @@ public class BrightnessTracker { 


    /** Stop listening for events */

    void stop() {

        synchronized (mDataCollectionLock) {

            if (!mStarted) {

                return;

            }

        }

        if (DEBUG) {

            Slog.d(TAG, "Stop");

        }

services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java

+24 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertSame;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;
@@ -885,6 +886,29 @@ public class BrightnessTrackerTest { 
        assertNull(mInjector.mLightSensor);

    }



    @Test

    public void testOnlyOneReceiverRegistered() {

        assertNull(mInjector.mLightSensor);

        assertNull(mInjector.mSensorListener);

        startTracker(mTracker, 0.3f, false);



        assertNotNull(mInjector.mLightSensor);

        assertNotNull(mInjector.mSensorListener);

        Sensor registeredLightSensor = mInjector.mLightSensor;

        SensorEventListener registeredSensorListener = mInjector.mSensorListener;



        mTracker.start(0.3f);

        assertSame(registeredLightSensor, mInjector.mLightSensor);

        assertSame(registeredSensorListener, mInjector.mSensorListener);



        mTracker.stop();

        assertNull(mInjector.mLightSensor);

        assertNull(mInjector.mSensorListener);



        // mInjector asserts that we aren't removing a null receiver

        mTracker.stop();

    }



    private InputStream getInputStream(String data) {

        return new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));

    }