From b34ebbedcf3b20e0b5b2e06327fa51d6439e2f21 Mon Sep 17 00:00:00 2001 From: Rebecca Silberstein Date: Sun, 30 Apr 2017 20:02:59 +0000 Subject: [PATCH] Revert "WifiManager: expose Local Only Hotspot APIs" This reverts commit ec18f81e5b8bc4e4486b00f37e68cff4ff9131eb. Reverting the CL to expose the APIs so we have more time for testing and ironing out the API. Bug: 31466854 Bug: 37073685 Test: make update-api Test: make Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: frameworks/base/wifi/tests/runtests.sh Change-Id: I17d4e3e32e28dbbb08ba99c266a9b74044e6001d --- api/current.txt | 16 ---------------- api/system-current.txt | 16 ---------------- api/test-current.txt | 16 ---------------- wifi/java/android/net/wifi/WifiManager.java | 7 +++++++ 4 files changed, 7 insertions(+), 48 deletions(-) diff --git a/api/current.txt b/api/current.txt index 3695a4295cfc..c8bfa47335c6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -26552,7 +26552,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); @@ -26603,21 +26602,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(); diff --git a/api/system-current.txt b/api/system-current.txt index 5dec7df1d7d5..1696bfa308d3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -29132,7 +29132,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); @@ -29210,21 +29209,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(); diff --git a/api/test-current.txt b/api/test-current.txt index 8018f7c9a632..a97f16592934 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -26660,7 +26660,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); @@ -26711,21 +26710,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(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 0e1eb15ca9e5..8fbf4721a20e 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -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"); -- 2.11.0