Merge "Deprecate BSSID Hostlist system API" into oc-dev (5fc916d8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+11 −11

wifi/java/android/net/wifi/WifiScanner.java

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -906,6 +906,7 @@ public class WifiScanner {
	}		}

	/** specifies information about an access point of interest */		/** specifies information about an access point of interest */
			@Deprecated
	public static class BssidInfo {		public static class BssidInfo {
	/** bssid of the access point; in XX:XX:XX:XX:XX:XX format */		/** bssid of the access point; in XX:XX:XX:XX:XX:XX format */
	public String bssid;		public String bssid;
	@@ -919,6 +920,7 @@ public class WifiScanner {

	/** @hide */		/** @hide */
	@SystemApi		@SystemApi
			@Deprecated
	public static class WifiChangeSettings implements Parcelable {		public static class WifiChangeSettings implements Parcelable {
	public int rssiSampleSize; /* sample size for RSSI averaging */		public int rssiSampleSize; /* sample size for RSSI averaging */
	public int lostApSampleSize; /* samples to confirm AP's loss */		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 periodInMs indicates period of scan to find changes
	* @param bssidInfos access points to watch		* @param bssidInfos access points to watch
	*/		*/
			@Deprecated
	public void configureWifiChange(		public void configureWifiChange(
	int rssiSampleSize, /* sample size for RSSI averaging */		int rssiSampleSize, /* sample size for RSSI averaging */
	int lostApSampleSize, /* samples to confirm AP's loss */		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}		* interface to get wifi change events on; use this on {@link #startTrackingWifiChange}
	*/		*/
			@Deprecated
	public interface WifiChangeListener extends ActionListener {		public interface WifiChangeListener extends ActionListener {
	/** indicates that changes were detected in wifi environment		/** indicates that changes were detected in wifi environment
	* @param results indicate the access points that exhibited change		* @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		* @param listener object to report events on; this object must be unique and must also be
	* provided on {@link #stopTrackingWifiChange}		* provided on {@link #stopTrackingWifiChange}
	*/		*/
			@Deprecated
	public void startTrackingWifiChange(WifiChangeListener listener) {		public void startTrackingWifiChange(WifiChangeListener listener) {
	throw new UnsupportedOperationException();		throw new UnsupportedOperationException();
	}		}
	@@ -999,17 +1004,20 @@ public class WifiScanner {
	* @param listener object that was provided to report events on {@link		* @param listener object that was provided to report events on {@link
	* #stopTrackingWifiChange}		* #stopTrackingWifiChange}
	*/		*/
			@Deprecated
	public void stopTrackingWifiChange(WifiChangeListener listener) {		public void stopTrackingWifiChange(WifiChangeListener listener) {
	throw new UnsupportedOperationException();		throw new UnsupportedOperationException();
	}		}

	/** @hide */		/** @hide */
	@SystemApi		@SystemApi
			@Deprecated
	public void configureWifiChange(WifiChangeSettings settings) {		public void configureWifiChange(WifiChangeSettings settings) {
	throw new UnsupportedOperationException();		throw new UnsupportedOperationException();
	}		}

	/** interface to receive hotlist events on; use this on {@link #setHotlist} */		/** interface to receive hotlist events on; use this on {@link #setHotlist} */
			@Deprecated
	public static interface BssidListener extends ActionListener {		public static interface BssidListener extends ActionListener {
	/** indicates that access points were found by on going scans		/** indicates that access points were found by on going scans
	* @param results list of scan results, one for each access point visible currently		* @param results list of scan results, one for each access point visible currently
	@@ -1023,6 +1031,7 @@ public class WifiScanner {

	/** @hide */		/** @hide */
	@SystemApi		@SystemApi
			@Deprecated
	public static class HotlistSettings implements Parcelable {		public static class HotlistSettings implements Parcelable {
	public BssidInfo[] bssidInfos;		public BssidInfo[] bssidInfos;
	public int apLostThreshold;		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		* @param listener object provided to report events on; this object must be unique and must
	* also be provided on {@link #stopTrackingBssids}		* also be provided on {@link #stopTrackingBssids}
	*/		*/
			@Deprecated
	public void startTrackingBssids(BssidInfo[] bssidInfos,		public void startTrackingBssids(BssidInfo[] bssidInfos,
	int apLostThreshold, BssidListener listener) {		int apLostThreshold, BssidListener listener) {
	throw new UnsupportedOperationException();		throw new UnsupportedOperationException();
	@@ -1066,6 +1076,7 @@ public class WifiScanner {
	* remove tracking of interesting access points		* remove tracking of interesting access points
	* @param listener same object provided in {@link #startTrackingBssids}		* @param listener same object provided in {@link #startTrackingBssids}
	*/		*/
			@Deprecated
	public void stopTrackingBssids(BssidListener listener) {		public void stopTrackingBssids(BssidListener listener) {
	throw new UnsupportedOperationException();		throw new UnsupportedOperationException();
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -29316,19 +29316,19 @@ package android.net.wifi {
	}		}

	public class WifiScanner {		public class WifiScanner {
	method public void configureWifiChange(int, int, int, int, int, android.net.wifi.WifiScanner.BssidInfo[]);		method public deprecated 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(android.net.wifi.WifiScanner.WifiChangeSettings);
	method public boolean getScanResults();		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);
	method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);		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);
	method public void startScan(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, android.os.WorkSource);
	method public void startTrackingBssids(android.net.wifi.WifiScanner.BssidInfo[], int, android.net.wifi.WifiScanner.BssidListener);		method public deprecated 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 startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
	method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener);		method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener);
	method public void stopScan(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 deprecated void stopTrackingBssids(android.net.wifi.WifiScanner.BssidListener);
	method public void stopTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);		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 MAX_SCAN_PERIOD_MS = 1024000; // 0xfa000
	field public static final int MIN_SCAN_PERIOD_MS = 1000; // 0x3e8		field public static final int MIN_SCAN_PERIOD_MS = 1000; // 0x3e8
	field public static final int REASON_DUPLICATE_REQEUST = -5; // 0xfffffffb		field public static final int REASON_DUPLICATE_REQEUST = -5; // 0xfffffffb
	@@ -29355,7 +29355,7 @@ package android.net.wifi {
	method public abstract void onSuccess();		method public abstract void onSuccess();
	}		}

	public static class WifiScanner.BssidInfo {		public static deprecated class WifiScanner.BssidInfo {
	ctor public WifiScanner.BssidInfo();		ctor public WifiScanner.BssidInfo();
	field public java.lang.String bssid;		field public java.lang.String bssid;
	field public int frequencyHint;		field public int frequencyHint;
	@@ -29363,7 +29363,7 @@ package android.net.wifi {
	field public int low;		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 onFound(android.net.wifi.ScanResult[]);
	method public abstract void onLost(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;		field public int frequency;
	}		}