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

Commit eb11b240 authored by Kwangkyu Park's avatar Kwangkyu Park
Browse files

Fix an issue that the FoldStateListener induces a memory leak 

FoldStateListener is non-static inner class and keeps reference to
the outer class which is CameraManager. As CameraManager also keeps
context with mContext, memory leak could exist.

Changing FoldStateListener to static inner class, so that the class
won't keep the reference.

Bug: 242264787
Test: Manual test with memory profiling
Change-Id: I77652bd94b50eabc80041e13274b619c0da36601
parent 00545d0f

core/java/android/hardware/camera2/CameraManager.java

+24 −20
Original line number Diff line number Diff line
@@ -124,9 +124,6 @@ public final class CameraManager { 
    private HandlerThread mHandlerThread;

    private Handler mHandler;

    private FoldStateListener mFoldStateListener;

    @GuardedBy("mLock")

    private ArrayList<WeakReference<DeviceStateListener>> mDeviceStateListeners = new ArrayList<>();

    private boolean mFoldedDeviceState;



    /**

     * @hide
@@ -135,17 +132,21 @@ public final class CameraManager { 
        void onDeviceStateChanged(boolean folded);

    }



    private final class FoldStateListener implements DeviceStateManager.DeviceStateCallback {

    private static final class FoldStateListener implements DeviceStateManager.DeviceStateCallback {

        private final int[] mFoldedDeviceStates;



        private ArrayList<WeakReference<DeviceStateListener>> mDeviceStateListeners =

                new ArrayList<>();

        private boolean mFoldedDeviceState;



        public FoldStateListener(Context context) {

            mFoldedDeviceStates = context.getResources().getIntArray(

                    com.android.internal.R.array.config_foldedDeviceStates);

        }



        private void handleStateChange(int state) {

        private synchronized void handleStateChange(int state) {

            boolean folded = ArrayUtils.contains(mFoldedDeviceStates, state);

            synchronized (mLock) {



            mFoldedDeviceState = folded;

            ArrayList<WeakReference<DeviceStateListener>> invalidListeners = new ArrayList<>();

            for (WeakReference<DeviceStateListener> listener : mDeviceStateListeners) {
@@ -160,6 +161,10 @@ public final class CameraManager { 
                mDeviceStateListeners.removeAll(invalidListeners);

            }

        }



        public synchronized void addDeviceStateListener(DeviceStateListener listener) {

            listener.onDeviceStateChanged(mFoldedDeviceState);

            mDeviceStateListeners.add(new WeakReference<>(listener));

        }



        @Override
@@ -183,9 +188,8 @@ public final class CameraManager { 
    public void registerDeviceStateListener(@NonNull CameraCharacteristics chars) {

        synchronized (mLock) {

            DeviceStateListener listener = chars.getDeviceStateListener();

            listener.onDeviceStateChanged(mFoldedDeviceState);

            if (mFoldStateListener != null) {

                mDeviceStateListeners.add(new WeakReference<>(listener));

                mFoldStateListener.addDeviceStateListener(listener);

            }

        }

    }