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

Commit 42df638b authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Fix MediaOutputController resource management 

MediaOutputController currently stops scanning when no
request to scan has been made yet, and also performs
unnecessary null checks.

Also remove dead code.

Bug: 232812007
Test: atest SystemUITests
Change-Id: I396d376a54b89c95a531b1499bd50be2e4242ed1
parent 147cb7c8

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+2 −20
Original line number Diff line number Diff line
@@ -209,15 +209,7 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
                Log.d(TAG, "No media controller for " + mPackageName);

            }

        }

        if (mLocalMediaManager == null) {

            if (DEBUG) {

                Log.d(TAG, "No local media manager " + mPackageName);

            }

            return;

        }

        mCallback = cb;

        mLocalMediaManager.unregisterCallback(this);

        mLocalMediaManager.stopScan();

        mLocalMediaManager.registerCallback(this);

        mLocalMediaManager.startScan();

    }
@@ -239,10 +231,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        if (mMediaController != null) {

            mMediaController.unregisterCallback(mCb);

        }

        if (mLocalMediaManager != null) {

        mLocalMediaManager.unregisterCallback(this);

        mLocalMediaManager.stopScan();

        }

        synchronized (mMediaDevicesLock) {

            mCachedMediaDevices.clear();

            mMediaDevices.clear();
@@ -619,10 +609,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        return mLocalMediaManager.getCurrentConnectedDevice();

    }



    private MediaDevice getMediaDeviceById(String id) {

        return mLocalMediaManager.getMediaDeviceById(new ArrayList<>(mMediaDevices), id);

    }



    boolean addDeviceToPlayMedia(MediaDevice device) {

        mMetricLogger.logInteractionExpansion(device);

        return mLocalMediaManager.addDeviceToPlayMedia(device);
@@ -644,10 +630,6 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
        return mLocalMediaManager.getDeselectableMediaDevice();

    }



    void adjustSessionVolume(String sessionId, int volume) {

        mLocalMediaManager.adjustSessionVolume(sessionId, volume);

    }



    void adjustSessionVolume(int volume) {

        mLocalMediaManager.adjustSessionVolume(volume);

    }