Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clarify IControlsTethering LOCAL_ONLY state name" am: 649c459858 am: f7c93bcd45

Browse Source 
am: 6305795287

Change-Id: Idf256ced2c3403f9672b29c10ec02adb44a0ab7c
This commit is contained in:
Erik Kline
2017-04-21 09:18:50 +00:00
committed by android-build-merger
parent 5a081a225f 6305795287
commit 09d1588183
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/Tethering.java
View File

@@ -139,7 +139,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
public boolean isCurrentlyServing() {
switch (lastState) {
case IControlsTethering.STATE_TETHERED:
case IControlsTethering.STATE_LOCAL_HOTSPOT:
case IControlsTethering.STATE_LOCAL_ONLY:
return true;
default:
return false;
@@ -646,7 +646,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
erroredList.add(iface);
} else if (tetherState.lastState == IControlsTethering.STATE_AVAILABLE) {
availableList.add(iface);
} else if (tetherState.lastState == IControlsTethering.STATE_LOCAL_HOTSPOT) {
} else if (tetherState.lastState == IControlsTethering.STATE_LOCAL_ONLY) {
localOnlyList.add(iface);
} else if (tetherState.lastState == IControlsTethering.STATE_TETHERED) {
if (cfg.isUsb(iface)) {
@@ -824,7 +824,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
// Otherwise, assume it's a local-only hotspot request.
final int state = mWifiTetherRequested
? IControlsTethering.STATE_TETHERED
: IControlsTethering.STATE_LOCAL_HOTSPOT;
: IControlsTethering.STATE_LOCAL_ONLY;
tetherMatchingInterfaces(state, ConnectivityManager.TETHERING_WIFI);
break;
case WifiManager.WIFI_AP_STATE_DISABLED:
@@ -894,7 +894,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
result = untether(chosenIface);
break;
case IControlsTethering.STATE_TETHERED:
case IControlsTethering.STATE_LOCAL_HOTSPOT:
case IControlsTethering.STATE_LOCAL_ONLY:
result = tether(chosenIface, requestedState);
break;
default:
@@ -1653,7 +1653,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
case IControlsTethering.STATE_TETHERED:
pw.print("TetheredState");
break;
case IControlsTethering.STATE_LOCAL_HOTSPOT:
case IControlsTethering.STATE_LOCAL_ONLY:
pw.print("LocalHotspotState");
break;
default:
@@ -1708,7 +1708,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering
which = TetherMasterSM.EVENT_IFACE_SERVING_STATE_INACTIVE;
break;
case IControlsTethering.STATE_TETHERED:
case IControlsTethering.STATE_LOCAL_HOTSPOT:
case IControlsTethering.STATE_LOCAL_ONLY:
which = TetherMasterSM.EVENT_IFACE_SERVING_STATE_ACTIVE;
break;
default:

6
services/core/java/com/android/server/connectivity/tethering/IControlsTethering.java
View File

@@ -23,9 +23,9 @@ package com.android.server.connectivity.tethering;
*/
public interface IControlsTethering {
public final int STATE_UNAVAILABLE = 0;
public final int STATE_AVAILABLE = 1;
public final int STATE_TETHERED = 2;
public final int STATE_LOCAL_HOTSPOT = 3;
public final int STATE_AVAILABLE = 1;
public final int STATE_TETHERED = 2;
public final int STATE_LOCAL_ONLY = 3;
/**
* Notify that |who| has changed its tethering state. This may be called from any thread.

2
services/core/java/com/android/server/connectivity/tethering/IPv6TetheringCoordinator.java
View File

@@ -172,7 +172,7 @@ public class IPv6TetheringCoordinator {
final Downstream ds = findDownstream(sm);
if (ds == null) return null;
if (ds.mode == IControlsTethering.STATE_LOCAL_HOTSPOT) {
if (ds.mode == IControlsTethering.STATE_LOCAL_ONLY) {
// Build a Unique Locally-assigned Prefix configuration.
return getUniqueLocalConfig(mUniqueLocalPrefix, ds.subnetId);
}

4
services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
View File

@@ -194,7 +194,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
case CMD_TETHER_REQUESTED:
mLastError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
switch (message.arg1) {
case IControlsTethering.STATE_LOCAL_HOTSPOT:
case IControlsTethering.STATE_LOCAL_ONLY:
transitionTo(mLocalHotspotState);
break;
case IControlsTethering.STATE_TETHERED:
@@ -304,7 +304,7 @@ public class TetherInterfaceStateMachine extends StateMachine {
}
if (DBG) Log.d(TAG, "Local hotspot " + mIfaceName);
sendInterfaceState(IControlsTethering.STATE_LOCAL_HOTSPOT);
sendInterfaceState(IControlsTethering.STATE_LOCAL_ONLY);
}
@Override

1
tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java
View File

@@ -32,7 +32,6 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
import static android.net.ConnectivityManager.TETHERING_USB;
import static android.net.ConnectivityManager.TETHERING_WIFI;
import static com.android.server.connectivity.tethering.IControlsTethering.STATE_AVAILABLE;
import static com.android.server.connectivity.tethering.IControlsTethering.STATE_LOCAL_HOTSPOT;
import static com.android.server.connectivity.tethering.IControlsTethering.STATE_TETHERED;
import static com.android.server.connectivity.tethering.IControlsTethering.STATE_UNAVAILABLE;