Merge "Fix MediaOutputController resource management" (2d3e5f9a) · Commits · e / os / android_frameworks_base

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();
		@@ -622,10 +612,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);
		@@ -647,10 +633,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);
		}