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

Commit c40d714c authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected... 

Merge "Tethering: Use new ACTION_USB_STATE broadcast to monitor USB connected state" into gingerbread
parents b7304593 ac051ae7

services/java/com/android/server/connectivity/Tethering.java

+5 −6
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.hardware.Usb;

import android.net.ConnectivityManager;

import android.net.InterfaceConfiguration;

import android.net.IConnectivityManager;

import android.net.INetworkManagementEventObserver;

import android.net.NetworkInfo;

import android.net.NetworkUtils;

import android.os.BatteryManager;

import android.os.Binder;

import android.os.Environment;

import android.os.HandlerThread;
@@ -135,7 +135,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 


        mStateReceiver = new StateReceiver();

        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_BATTERY_CHANGED);

        filter.addAction(Usb.ACTION_USB_STATE);

        filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);

        filter.addAction(Intent.ACTION_BOOT_COMPLETED);

        mContext.registerReceiver(mStateReceiver, filter);
@@ -424,10 +424,9 @@ public class Tethering extends INetworkManagementEventObserver.Stub { 
    private class StateReceiver extends BroadcastReceiver {

        public void onReceive(Context content, Intent intent) {

            String action = intent.getAction();

            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {

                mUsbConnected = (intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1)

                        == BatteryManager.BATTERY_PLUGGED_USB);

                Tethering.this.updateUsbStatus();

            if (action.equals(Usb.ACTION_USB_STATE)) {

                mUsbConnected = intent.getExtras().getBoolean(Usb.USB_CONNECTED);

                updateUsbStatus();

            } else if (action.equals(Intent.ACTION_MEDIA_SHARED)) {

                mUsbMassStorageOff = false;

                updateUsbStatus();