Merge "Comment out unused methods" (cb8724c5) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/alsa/AlsaDevicesParser.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -199,9 +199,11 @@ public class AlsaDevicesParser {
		//
		// Predicates
		//
		/*
		public boolean hasPlaybackDevices() {
		return mHasPlaybackDevices;
		}
		*/

		public boolean hasPlaybackDevices(int card) {
		for (AlsaDeviceRecord deviceRecord : mDeviceRecords) {
		@@ -214,9 +216,11 @@ public class AlsaDevicesParser {
		return false;
		}

		/*
		public boolean hasCaptureDevices() {
		return mHasCaptureDevices;
		}
		*/

		public boolean hasCaptureDevices(int card) {
		for (AlsaDeviceRecord deviceRecord : mDeviceRecords) {
		@@ -229,9 +233,11 @@ public class AlsaDevicesParser {
		return false;
		}

		/*
		public boolean hasMIDIDevices() {
		return mHasMIDIDevices;
		}
		*/

		public boolean hasMIDIDevices(int card) {
		for (AlsaDeviceRecord deviceRecord : mDeviceRecords) {

+11 −4

Original line number	Diff line number	Diff line
		@@ -497,6 +497,7 @@ public final class UsbAlsaManager {
		//
		// Devices List
		//
		/*
		public ArrayList<UsbAudioDevice> getConnectedDevices() {
		ArrayList<UsbAudioDevice> devices = new ArrayList<UsbAudioDevice>(mAudioDevices.size());
		for (HashMap.Entry<UsbDevice,UsbAudioDevice> entry : mAudioDevices.entrySet()) {
		@@ -504,6 +505,7 @@ public final class UsbAlsaManager {
		}
		return devices;
		}
		*/

		//
		// Logging
		@@ -519,6 +521,7 @@ public final class UsbAlsaManager {
		}
		}

		/*
		public void logDevicesList(String title) {
		if (DEBUG) {
		for (HashMap.Entry<UsbDevice,UsbAudioDevice> entry : mAudioDevices.entrySet()) {
		@@ -529,8 +532,10 @@ public final class UsbAlsaManager {
		}
		}
		}
		*/

		// This logs a more terse (and more readable) version of the devices list
		/*
		public void logDevices(String title) {
		if (DEBUG) {
		Slog.i(TAG, title);
		@@ -539,4 +544,6 @@ public final class UsbAlsaManager {
		}
		}
		}
		*/

		}