Merge "Push startScan and stopScan down into InfoMediaManager" into main (59b4888c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -139,7 +139,6 @@ public abstract class InfoMediaManager extends MediaManager {
		}
		}

		@Override
		public void startScan() {
		mMediaDevices.clear();
		startScanOnRouter();
		@@ -156,7 +155,6 @@ public abstract class InfoMediaManager extends MediaManager {
		}
		}

		@Override
		public abstract void stopScan();

		protected abstract void startScanOnRouter();

+0 −10

Original line number	Diff line number	Diff line
		@@ -54,16 +54,6 @@ public abstract class MediaManager {
		}
		}

		/**
		* Start scan connected MediaDevice
		*/
		public abstract void startScan();

		/**
		* Stop scan MediaDevice
		*/
		public abstract void stopScan();

		protected MediaDevice findMediaDevice(String id) {
		for (MediaDevice mediaDevice : mMediaDevices) {
		if (mediaDevice.getId().equals(id)) {

+1 −11

Original line number	Diff line number	Diff line
		@@ -52,17 +52,7 @@ public class MediaManagerTest {

		when(mDevice.getId()).thenReturn(TEST_ID);

		mMediaManager = new MediaManager(mContext, null) {
		@Override
		public void startScan() {

		}

		@Override
		public void stopScan() {

		}
		};
		mMediaManager = new MediaManager(mContext, null) {};
		}

		@Test