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

Merge "Revert "WifiManager: expose Local Only Hotspot APIs"" into oc-dev

Browse Source
This commit is contained in:
Rebecca Silberstein
2017-04-30 21:54:43 +00:00
committed by Android (Google) Code Review
parent 07ea44909f b34ebbedcf
commit ad4c31fecf
4 changed files with 7 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/current.txt
View File

@@ -26549,7 +26549,6 @@ package android.net.wifi {
method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
method public boolean setWifiEnabled(boolean);
method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler);
method public boolean startScan();
method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
method public int updateNetwork(android.net.wifi.WifiConfiguration);
@@ -26600,21 +26599,6 @@ package android.net.wifi {
field public static final int WPS_WEP_PROHIBITED = 4; // 0x4
}
public static class WifiManager.LocalOnlyHotspotCallback {
ctor public WifiManager.LocalOnlyHotspotCallback();
method public void onFailed(int);
method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation);
method public void onStopped();
field public static final int ERROR_GENERIC = 2; // 0x2
field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3
field public static final int ERROR_NO_CHANNEL = 1; // 0x1
}
public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable {
method public void close();
method public android.net.wifi.WifiConfiguration getConfig();
}
public class WifiManager.MulticastLock {
method public void acquire();
method public boolean isHeld();

16
api/system-current.txt
View File

@@ -29130,7 +29130,6 @@ package android.net.wifi {
method public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
method public boolean setWifiApEnabled(android.net.wifi.WifiConfiguration, boolean);
method public boolean setWifiEnabled(boolean);
method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler);
method public deprecated boolean startLocationRestrictedScan(android.os.WorkSource);
method public boolean startScan();
method public boolean startScan(android.os.WorkSource);
@@ -29208,21 +29207,6 @@ package android.net.wifi {
method public abstract void onSuccess();
}
public static class WifiManager.LocalOnlyHotspotCallback {
ctor public WifiManager.LocalOnlyHotspotCallback();
method public void onFailed(int);
method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation);
method public void onStopped();
field public static final int ERROR_GENERIC = 2; // 0x2
field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3
field public static final int ERROR_NO_CHANNEL = 1; // 0x1
}
public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable {
method public void close();
method public android.net.wifi.WifiConfiguration getConfig();
}
public class WifiManager.MulticastLock {
method public void acquire();
method public boolean isHeld();

16
api/test-current.txt
View File

@@ -26657,7 +26657,6 @@ package android.net.wifi {
method public void setTdlsEnabled(java.net.InetAddress, boolean);
method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
method public boolean setWifiEnabled(boolean);
method public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, android.os.Handler);
method public boolean startScan();
method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
method public int updateNetwork(android.net.wifi.WifiConfiguration);
@@ -26708,21 +26707,6 @@ package android.net.wifi {
field public static final int WPS_WEP_PROHIBITED = 4; // 0x4
}
public static class WifiManager.LocalOnlyHotspotCallback {
ctor public WifiManager.LocalOnlyHotspotCallback();
method public void onFailed(int);
method public void onStarted(android.net.wifi.WifiManager.LocalOnlyHotspotReservation);
method public void onStopped();
field public static final int ERROR_GENERIC = 2; // 0x2
field public static final int ERROR_INCOMPATIBLE_MODE = 3; // 0x3
field public static final int ERROR_NO_CHANNEL = 1; // 0x1
}
public class WifiManager.LocalOnlyHotspotReservation implements java.lang.AutoCloseable {
method public void close();
method public android.net.wifi.WifiConfiguration getConfig();
}
public class WifiManager.MulticastLock {
method public void acquire();
method public boolean isHeld();

7
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -1882,6 +1882,8 @@ public class WifiManager {
* operating status.
* @param handler Handler to be used for callbacks. If the caller passes a null Handler, the
* main thread will be used.
*
* @hide
*/
public void startLocalOnlyHotspot(LocalOnlyHotspotCallback callback,
@Nullable Handler handler) {
@@ -2272,6 +2274,8 @@ public class WifiManager {
* any further callbacks. If the LocalOnlyHotspot is stopped due to a
* user triggered mode change, applications will be notified via the {@link
* LocalOnlyHotspotCallback#onStopped()} callback.
*
* @hide
*/
public class LocalOnlyHotspotReservation implements AutoCloseable {
@@ -2314,6 +2318,8 @@ public class WifiManager {
/**
* Callback class for applications to receive updates about the LocalOnlyHotspot status.
*
* @hide
*/
public static class LocalOnlyHotspotCallback {
public static final int ERROR_NO_CHANNEL = 1;
@@ -2436,6 +2442,7 @@ public class WifiManager {
public class LocalOnlyHotspotSubscription implements AutoCloseable {
private final CloseGuard mCloseGuard = CloseGuard.get();
/** @hide */
@VisibleForTesting
public LocalOnlyHotspotSubscription() {
mCloseGuard.open("close");