Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3747eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev

parents b216d0f0 c889b4f4

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

+15 −5
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import java.io.IOException; 
import java.util.HashMap;

import java.util.Locale;

import java.util.Map;

import java.util.Random;

import java.util.Scanner;

import java.util.Set;
@@ -537,6 +538,7 @@ public class UsbDeviceManager { 
                    oldFunctions = UsbManager.USB_FUNCTION_NONE;

                }



                Slog.i(TAG, "Setting adb to " + String.valueOf(enable));

                setEnabledFunctions(oldFunctions, true, mUsbDataUnlocked);

                updateAdbNotification();

            }
@@ -764,15 +766,16 @@ public class UsbDeviceManager { 


            // send broadcast intent only if the USB state has changed

            if (!isUsbStateChanged(intent)) {

                if (DEBUG) {

                    Slog.d(TAG, "skip broadcasting " + intent + " extras: " + intent.getExtras());

                }

                Slog.i(TAG, "skip broadcasting " + intent + " extras: " + intent.getExtras());

                return;

            }

            mBroadcastedIntent = intent;



            if (DEBUG) Slog.d(TAG, "broadcasting " + intent + " extras: " + intent.getExtras());

            Random rand = new Random();

            intent.putExtra("random_tag", rand.nextInt(1000));

            Slog.i(TAG, "broadcasting " + intent + " extras: " + intent.getExtras());

            mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);

            mBroadcastedIntent = intent;

            intent.removeExtra("random_tag");

        }



        private void updateUsbFunctions() {
@@ -845,8 +848,10 @@ public class UsbDeviceManager { 
                        updateCurrentAccessory();

                    }

                    if (mBootCompleted) {

                        Slog.i(TAG, "update state " + mConnected + " " + mConfigured);

                        if (!mConnected) {

                            // restore defaults when USB is disconnected

                            Slog.i(TAG, "Disconnect, setting usb functions to null");

                            setEnabledFunctions(null, false, false);

                        }

                        updateUsbStateBroadcastIfNeeded(false);
@@ -880,6 +885,7 @@ public class UsbDeviceManager { 
                    break;

                case MSG_SET_CURRENT_FUNCTIONS:

                    String functions = (String) msg.obj;

                    Slog.i(TAG, "Getting setFunction command for " + functions);

                    setEnabledFunctions(functions, false, msg.arg1 == 1);

                    break;

                case MSG_UPDATE_USER_RESTRICTIONS:
@@ -887,6 +893,8 @@ public class UsbDeviceManager { 
                    final boolean forceRestart = mUsbDataUnlocked

                            && isUsbDataTransferActive()

                            && !isUsbTransferAllowed();

                    Slog.i(TAG, "Updating user restrictions, force restart is "

                            + String.valueOf(forceRestart));

                    setEnabledFunctions(

                            mCurrentFunctions, forceRestart, mUsbDataUnlocked && !forceRestart);

                    break;
@@ -901,6 +909,7 @@ public class UsbDeviceManager { 
                        updateUsbStateBroadcastIfNeeded(false);

                        mPendingBootBroadcast = false;

                    }

                    Slog.i(TAG, "Boot complete, setting default functions");

                    setEnabledFunctions(null, false, false);

                    if (mCurrentAccessory != null) {

                        getCurrentSettings().accessoryAttached(mCurrentAccessory);
@@ -918,6 +927,7 @@ public class UsbDeviceManager { 
                            Slog.v(TAG, "Current user switched to " + msg.arg1

                                    + "; resetting USB host stack for MTP or PTP");

                            // avoid leaking sensitive data from previous user

                            Slog.i(TAG, "User Switched, kicking usb stack");

                            setEnabledFunctions(mCurrentFunctions, true, false);

                        }

                        mCurrentUser = msg.arg1;