LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add local-only hotspot info into tether state change broadcast" am: 21a081bf34 am: 6af3dd0fc3

Browse Source 
am: 3fa8908370

Change-Id: If3851c3f15314e3c0d357e154049aaa2b8b5c8e7
This commit is contained in:
Erik Kline
2017-04-20 14:02:24 +00:00
committed by android-build-merger
parent 6fa7889bd8 21a081bf34
commit 015d03a4d1
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/net/ConnectivityManager.java
View File

@@ -301,7 +301,8 @@ public class ConnectivityManager {
/** /**
* Broadcast Action: A tetherable connection has come or gone. * Broadcast Action: A tetherable connection has come or gone.
* Uses {@code ConnectivityManager.EXTRA_AVAILABLE_TETHER}, * Uses {@code ConnectivityManager.EXTRA_AVAILABLE_TETHER},
* {@code ConnectivityManager.EXTRA_ACTIVE_TETHER} and * {@code ConnectivityManager.EXTRA_ACTIVE_LOCAL_ONLY},
* {@code ConnectivityManager.EXTRA_ACTIVE_TETHER}, and
* {@code ConnectivityManager.EXTRA_ERRORED_TETHER} to indicate * {@code ConnectivityManager.EXTRA_ERRORED_TETHER} to indicate
* the current state of tethering. Each include a list of * the current state of tethering. Each include a list of
* interface names in that state (may be empty). * interface names in that state (may be empty).
@@ -320,10 +321,17 @@ public class ConnectivityManager {
/** /**
* @hide * @hide
* gives a String[] listing all the interfaces currently tethered * gives a String[] listing all the interfaces currently in local-only
* (ie, has dhcp support and packets potentially forwarded/NATed) * mode (ie, has DHCPv4+IPv6-ULA support and no packet forwarding)
*/ */
public static final String EXTRA_ACTIVE_TETHER = "activeArray"; public static final String EXTRA_ACTIVE_LOCAL_ONLY = "localOnlyArray";
/**
* @hide
* gives a String[] listing all the interfaces currently tethered
* (ie, has DHCPv4 support and packets potentially forwarded/NATed)
*/
public static final String EXTRA_ACTIVE_TETHER = "tetherArray";
/** /**
* @hide * @hide