Merge "UsbService: Fix problem detecting audio accessory mode when connected at boot" into jb-dev (b86bc105) · Commits · e / os / android_frameworks_base

services/java/com/android/server/usb/UsbDeviceManager.java

+23 −26

Original line number	Diff line number	Diff line
		@@ -322,8 +322,6 @@ public class UsbDeviceManager {
		String state = FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim();
		updateState(state);
		mAdbEnabled = containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_ADB);
		mAudioSourceEnabled = containsFunction(mCurrentFunctions,
		UsbManager.USB_FUNCTION_AUDIO_SOURCE);

		// Upgrade step for previous versions that used persist.service.adb.enable
		String value = SystemProperties.get("persist.service.adb.enable", "");
		@@ -537,7 +535,10 @@ public class UsbDeviceManager {
		mContext.sendStickyBroadcast(intent);
		}

		private void updateAudioSourceFunction(boolean enabled) {
		private void updateAudioSourceFunction() {
		boolean enabled = containsFunction(mCurrentFunctions,
		UsbManager.USB_FUNCTION_AUDIO_SOURCE);
		if (enabled != mAudioSourceEnabled) {
		// send a sticky broadcast containing current USB state
		Intent intent = new Intent(Intent.ACTION_USB_AUDIO_ACCESSORY_PLUG);
		intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);
		@@ -554,10 +555,10 @@ public class UsbDeviceManager {
		Slog.e(TAG, "could not open audio source PCM file", e);
		}
		}

		mContext.sendStickyBroadcast(intent);
		mAudioSourceEnabled = enabled;
		}
		}

		@Override
		public void handleMessage(Message msg) {
		@@ -578,11 +579,7 @@ public class UsbDeviceManager {
		}
		if (mBootCompleted) {
		updateUsbState();
		boolean audioSourceEnabled = containsFunction(mCurrentFunctions,
		UsbManager.USB_FUNCTION_AUDIO_SOURCE);
		if (audioSourceEnabled != mAudioSourceEnabled) {
		updateAudioSourceFunction(audioSourceEnabled);
		}
		updateAudioSourceFunction();
		}
		break;
		case MSG_ENABLE_ADB:
		@@ -597,13 +594,13 @@ public class UsbDeviceManager {
		updateUsbNotification();
		updateAdbNotification();
		updateUsbState();
		updateAudioSourceFunction();
		break;
		case MSG_BOOT_COMPLETED:
		mBootCompleted = true;
		if (mCurrentAccessory != null) {
		mSettingsManager.accessoryAttached(mCurrentAccessory);
		}
		updateAudioSourceFunction(mAudioSourceEnabled);
		break;
		}
		}