diff options
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 10 | ||||
| -rw-r--r-- | services/java/com/android/server/connectivity/Tethering.java | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 54bcdcb..cb4e89c 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -175,7 +175,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { private static final int MAX_HOSTROUTE_CYCLE_COUNT = 10; private Tethering mTethering; - private boolean mTetheringConfigValid = false; private KeyStore mKeyStore; @@ -589,10 +588,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } mTethering = new Tethering(mContext, mNetd, statsService, this, mHandler.getLooper()); - mTetheringConfigValid = ((mTethering.getTetherableUsbRegexs().length != 0 || - mTethering.getTetherableWifiRegexs().length != 0 || - mTethering.getTetherableBluetoothRegexs().length != 0) && - mTethering.getUpstreamIfaceTypes().length != 0); mVpn = new Vpn(mContext, mVpnCallback, mNetd, this); mVpn.startMonitoring(mContext, mTrackerHandler); @@ -3002,7 +2997,10 @@ public class ConnectivityService extends IConnectivityManager.Stub { int defaultVal = (SystemProperties.get("ro.tether.denied").equals("true") ? 0 : 1); boolean tetherEnabledInSettings = (Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.TETHER_SUPPORTED, defaultVal) != 0); - return tetherEnabledInSettings && mTetheringConfigValid; + return tetherEnabledInSettings && ((mTethering.getTetherableUsbRegexs().length != 0 || + mTethering.getTetherableWifiRegexs().length != 0 || + mTethering.getTetherableBluetoothRegexs().length != 0) && + mTethering.getUpstreamIfaceTypes().length != 0); } // An API NetworkStateTrackers can call when they lose their network. diff --git a/services/java/com/android/server/connectivity/Tethering.java b/services/java/com/android/server/connectivity/Tethering.java index 32f39b7..b83d885 100644 --- a/services/java/com/android/server/connectivity/Tethering.java +++ b/services/java/com/android/server/connectivity/Tethering.java @@ -157,6 +157,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { IntentFilter filter = new IntentFilter(); filter.addAction(UsbManager.ACTION_USB_STATE); filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION); + filter.addAction(Intent.ACTION_CONFIGURATION_CHANGED); mContext.registerReceiver(mStateReceiver, filter); filter = new IntentFilter(); @@ -516,6 +517,8 @@ public class Tethering extends INetworkManagementEventObserver.Stub { if (VDBG) Log.d(TAG, "Tethering got CONNECTIVITY_ACTION"); mTetherMasterSM.sendMessage(TetherMasterSM.CMD_UPSTREAM_CHANGED); } + } else if (action.equals(Intent.ACTION_CONFIGURATION_CHANGED)) { + updateConfiguration(); } } } @@ -618,7 +621,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { public int[] getUpstreamIfaceTypes() { int values[]; synchronized (mPublicSync) { - updateConfiguration(); + updateConfiguration(); // TODO - remove? values = new int[mUpstreamIfaceTypes.size()]; Iterator<Integer> iterator = mUpstreamIfaceTypes.iterator(); for (int i=0; i < mUpstreamIfaceTypes.size(); i++) { @@ -1289,7 +1292,7 @@ public class Tethering extends INetworkManagementEventObserver.Stub { int upType = ConnectivityManager.TYPE_NONE; String iface = null; - updateConfiguration(); + updateConfiguration(); // TODO - remove? synchronized (mPublicSync) { if (VDBG) { |