Merge "Revert "Upgrade logging for UsbDeviceManager to narrow down bugs."" (b69b789b) · Commits · e / os / android_frameworks_base

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

+5 −15

Original line number	Original line	Diff line number	Diff line
	@@ -69,7 +69,6 @@ import java.util.HashSet;
	import java.util.Iterator;		import java.util.Iterator;
	import java.util.Locale;		import java.util.Locale;
	import java.util.Map;		import java.util.Map;
	import java.util.Random;
	import java.util.Scanner;		import java.util.Scanner;
	import java.util.Set;		import java.util.Set;

	@@ -589,7 +588,6 @@ public class UsbDeviceManager {
	oldFunctions = UsbManager.USB_FUNCTION_NONE;		oldFunctions = UsbManager.USB_FUNCTION_NONE;
	}		}

	Slog.i(TAG, "Setting adb to " + String.valueOf(enable));
	setEnabledFunctions(oldFunctions, true, mUsbDataUnlocked);		setEnabledFunctions(oldFunctions, true, mUsbDataUnlocked);
	updateAdbNotification(false);		updateAdbNotification(false);
	}		}
	@@ -817,16 +815,15 @@ public class UsbDeviceManager {

	// send broadcast intent only if the USB state has changed		// send broadcast intent only if the USB state has changed
	if (!isUsbStateChanged(intent) && !configChanged) {		if (!isUsbStateChanged(intent) && !configChanged) {
	Slog.i(TAG, "skip broadcasting " + intent + " extras: " + intent.getExtras());		if (DEBUG) {
			Slog.d(TAG, "skip broadcasting " + intent + " extras: " + intent.getExtras());
			}
	return;		return;
	}		}
	mBroadcastedIntent = intent;

	Random rand = new Random();		if (DEBUG) Slog.d(TAG, "broadcasting " + intent + " extras: " + intent.getExtras());
	intent.putExtra("random_tag", rand.nextInt(1000));
	Slog.i(TAG, "broadcasting " + intent + " extras: " + intent.getExtras());
	mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);		mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
	intent.removeExtra("random_tag");		mBroadcastedIntent = intent;
	}		}

	private void updateUsbFunctions() {		private void updateUsbFunctions() {
	@@ -895,7 +892,6 @@ public class UsbDeviceManager {
	updateUsbNotification(false);		updateUsbNotification(false);
	updateAdbNotification(false);		updateAdbNotification(false);
	if (mBootCompleted) {		if (mBootCompleted) {
	Slog.i(TAG, "update state " + mConnected + " " + mConfigured);
	updateUsbStateBroadcastIfNeeded(false);		updateUsbStateBroadcastIfNeeded(false);
	}		}
	if (UsbManager.containsFunction(mCurrentFunctions,		if (UsbManager.containsFunction(mCurrentFunctions,
	@@ -905,7 +901,6 @@ public class UsbDeviceManager {
	if (mBootCompleted) {		if (mBootCompleted) {
	if (!mConnected) {		if (!mConnected) {
	// restore defaults when USB is disconnected		// restore defaults when USB is disconnected
	Slog.i(TAG, "Disconnect, setting usb functions to null");
	setEnabledFunctions(null, !mAdbEnabled, false);		setEnabledFunctions(null, !mAdbEnabled, false);
	}		}
	updateUsbFunctions();		updateUsbFunctions();
	@@ -992,7 +987,6 @@ public class UsbDeviceManager {
	break;		break;
	case MSG_SET_CURRENT_FUNCTIONS:		case MSG_SET_CURRENT_FUNCTIONS:
	String functions = (String) msg.obj;		String functions = (String) msg.obj;
	Slog.i(TAG, "Getting setFunction command for " + functions);
	setEnabledFunctions(functions, false, msg.arg1 == 1);		setEnabledFunctions(functions, false, msg.arg1 == 1);
	break;		break;
	case MSG_UPDATE_USER_RESTRICTIONS:		case MSG_UPDATE_USER_RESTRICTIONS:
	@@ -1000,8 +994,6 @@ public class UsbDeviceManager {
	final boolean forceRestart = mUsbDataUnlocked		final boolean forceRestart = mUsbDataUnlocked
	&& isUsbDataTransferActive()		&& isUsbDataTransferActive()
	&& !isUsbTransferAllowed();		&& !isUsbTransferAllowed();
	Slog.i(TAG, "Updating user restrictions, force restart is "
	+ String.valueOf(forceRestart));
	setEnabledFunctions(		setEnabledFunctions(
	mCurrentFunctions, forceRestart, mUsbDataUnlocked && !forceRestart);		mCurrentFunctions, forceRestart, mUsbDataUnlocked && !forceRestart);
	break;		break;
	@@ -1020,7 +1012,6 @@ public class UsbDeviceManager {
	updateUsbStateBroadcastIfNeeded(false);		updateUsbStateBroadcastIfNeeded(false);
	mPendingBootBroadcast = false;		mPendingBootBroadcast = false;
	}		}
	Slog.i(TAG, "Boot complete, setting default functions");
	setEnabledFunctions(null, false, false);		setEnabledFunctions(null, false, false);
	if (mCurrentAccessory != null) {		if (mCurrentAccessory != null) {
	getCurrentSettings().accessoryAttached(mCurrentAccessory);		getCurrentSettings().accessoryAttached(mCurrentAccessory);
	@@ -1038,7 +1029,6 @@ public class UsbDeviceManager {
	Slog.v(TAG, "Current user switched to " + msg.arg1		Slog.v(TAG, "Current user switched to " + msg.arg1
	+ "; resetting USB host stack for MTP or PTP");		+ "; resetting USB host stack for MTP or PTP");
	// avoid leaking sensitive data from previous user		// avoid leaking sensitive data from previous user
	Slog.i(TAG, "User Switched, kicking usb stack");
	setEnabledFunctions(mCurrentFunctions, true, false);		setEnabledFunctions(mCurrentFunctions, true, false);
	}		}
	mCurrentUser = msg.arg1;		mCurrentUser = msg.arg1;