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

Merge "Deprecate BSSID Hostlist system API" into oc-dev

Browse Source
This commit is contained in:
Michael Plass
2017-04-20 23:37:47 +00:00
committed by Android (Google) Code Review
parent b0806f1006 5b1979f5b9
commit 5fc916d852
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/system-current.txt
View File

@@ -29316,19 +29316,19 @@ package android.net.wifi {
}
public class WifiScanner {
method public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);
method public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);
method public deprecated void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);
method public deprecated void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);
method public boolean getScanResults();
method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);
method public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
method public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);
method public void startTrackingBssids(android.net.wifi.WifiScanner.BssidInfo[], int, android.net.wifi.WifiScanner.BssidListener);
method public void startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
method public deprecated void startTrackingBssids(android.net.wifi.WifiScanner.BssidInfo[], int, android.net.wifi.WifiScanner.BssidListener);
method public deprecated void startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener);
method public void stopScan(android.net.wifi.WifiScanner.ScanListener);
method public void stopTrackingBssids(android.net.wifi.WifiScanner.BssidListener);
method public void stopTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
method public deprecated void stopTrackingBssids(android.net.wifi.WifiScanner.BssidListener);
method public deprecated void stopTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
field public static final int MAX_SCAN_PERIOD_MS = 1024000; // 0xfa000
field public static final int MIN_SCAN_PERIOD_MS = 1000; // 0x3e8
field public static final int REASON_DUPLICATE_REQEUST = -5; // 0xfffffffb
@@ -29355,7 +29355,7 @@ package android.net.wifi {
method public abstract void onSuccess();
}
public static class WifiScanner.BssidInfo {
public static deprecated class WifiScanner.BssidInfo {
ctor public WifiScanner.BssidInfo();
field public java.lang.String bssid;
field public int frequencyHint;
@@ -29363,7 +29363,7 @@ package android.net.wifi {
field public int low;
}
public static abstract interface WifiScanner.BssidListener implements android.net.wifi.WifiScanner.ActionListener {
public static abstract deprecated interface WifiScanner.BssidListener implements android.net.wifi.WifiScanner.ActionListener {
method public abstract void onFound(android.net.wifi.ScanResult[]);
method public abstract void onLost(android.net.wifi.ScanResult[]);
}
@@ -29373,7 +29373,7 @@ package android.net.wifi {
field public int frequency;
}
public static class WifiScanner.HotlistSettings implements android.os.Parcelable {
public static deprecated class WifiScanner.HotlistSettings implements android.os.Parcelable {
ctor public WifiScanner.HotlistSettings();
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);
@@ -29427,12 +29427,12 @@ package android.net.wifi {
field public int stepCount;
}
public static abstract interface WifiScanner.WifiChangeListener implements android.net.wifi.WifiScanner.ActionListener {
public static abstract deprecated interface WifiScanner.WifiChangeListener implements android.net.wifi.WifiScanner.ActionListener {
method public abstract void onChanging(android.net.wifi.ScanResult[]);
method public abstract void onQuiescence(android.net.wifi.ScanResult[]);
}
public static class WifiScanner.WifiChangeSettings implements android.os.Parcelable {
public static deprecated class WifiScanner.WifiChangeSettings implements android.os.Parcelable {
ctor public WifiScanner.WifiChangeSettings();
method public int describeContents();
method public void writeToParcel(android.os.Parcel, int);

11
wifi/java/android/net/wifi/WifiScanner.java
View File

@@ -906,6 +906,7 @@ public class WifiScanner {
}
/** specifies information about an access point of interest */
@Deprecated
public static class BssidInfo {
/** bssid of the access point; in XX:XX:XX:XX:XX:XX format */
public String bssid;
@@ -919,6 +920,7 @@ public class WifiScanner {
/** @hide */
@SystemApi
@Deprecated
public static class WifiChangeSettings implements Parcelable {
public int rssiSampleSize; /* sample size for RSSI averaging */
public int lostApSampleSize; /* samples to confirm AP's loss */
@@ -959,6 +961,7 @@ public class WifiScanner {
* @param periodInMs indicates period of scan to find changes
* @param bssidInfos access points to watch
*/
@Deprecated
public void configureWifiChange(
int rssiSampleSize, /* sample size for RSSI averaging */
int lostApSampleSize, /* samples to confirm AP's loss */
@@ -974,6 +977,7 @@ public class WifiScanner {
/**
* interface to get wifi change events on; use this on {@link #startTrackingWifiChange}
*/
@Deprecated
public interface WifiChangeListener extends ActionListener {
/** indicates that changes were detected in wifi environment
* @param results indicate the access points that exhibited change
@@ -990,6 +994,7 @@ public class WifiScanner {
* @param listener object to report events on; this object must be unique and must also be
* provided on {@link #stopTrackingWifiChange}
*/
@Deprecated
public void startTrackingWifiChange(WifiChangeListener listener) {
throw new UnsupportedOperationException();
}
@@ -999,17 +1004,20 @@ public class WifiScanner {
* @param listener object that was provided to report events on {@link
* #stopTrackingWifiChange}
*/
@Deprecated
public void stopTrackingWifiChange(WifiChangeListener listener) {
throw new UnsupportedOperationException();
}
/** @hide */
@SystemApi
@Deprecated
public void configureWifiChange(WifiChangeSettings settings) {
throw new UnsupportedOperationException();
}
/** interface to receive hotlist events on; use this on {@link #setHotlist} */
@Deprecated
public static interface BssidListener extends ActionListener {
/** indicates that access points were found by on going scans
* @param results list of scan results, one for each access point visible currently
@@ -1023,6 +1031,7 @@ public class WifiScanner {
/** @hide */
@SystemApi
@Deprecated
public static class HotlistSettings implements Parcelable {
public BssidInfo[] bssidInfos;
public int apLostThreshold;
@@ -1057,6 +1066,7 @@ public class WifiScanner {
* @param listener object provided to report events on; this object must be unique and must
* also be provided on {@link #stopTrackingBssids}
*/
@Deprecated
public void startTrackingBssids(BssidInfo[] bssidInfos,
int apLostThreshold, BssidListener listener) {
throw new UnsupportedOperationException();
@@ -1066,6 +1076,7 @@ public class WifiScanner {
* remove tracking of interesting access points
* @param listener same object provided in {@link #startTrackingBssids}
*/
@Deprecated
public void stopTrackingBssids(BssidListener listener) {
throw new UnsupportedOperationException();
}