Merge "Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge" (e564c00e) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -6987,6 +6987,7 @@ package android.bluetooth.le {
		field public static final int SCAN_MODE_BALANCED = 1; // 0x1
		field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
		field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
		field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
		}

		public static final class ScanSettings.Builder {
		@@ -18617,7 +18618,10 @@ package android.net.wifi {
		field public int frequency;
		field public boolean is80211McRTTResponder;
		field public int level;
		field public java.lang.String operatorFriendlyName;
		field public boolean passpointNetwork;
		field public long timestamp;
		field public java.lang.String venueName;
		}

		public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {
		@@ -18644,6 +18648,7 @@ package android.net.wifi {
		public class WifiConfiguration implements android.os.Parcelable {
		ctor public WifiConfiguration();
		method public int describeContents();
		method public boolean isPasspoint();
		method public void writeToParcel(android.os.Parcel, int);
		field public java.lang.String BSSID;
		field public java.lang.String FQDN;

api/system-current.txt

+85 −17

Original line number	Diff line number	Diff line
		@@ -7181,6 +7181,7 @@ package android.bluetooth.le {
		field public static final int SCAN_MODE_BALANCED = 1; // 0x1
		field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
		field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
		field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
		field public static final int SCAN_RESULT_TYPE_ABBREVIATED = 1; // 0x1
		field public static final int SCAN_RESULT_TYPE_FULL = 0; // 0x0
		}
		@@ -20112,7 +20113,8 @@ package android.net.wifi {
		}

		public class RttManager {
		method public android.net.wifi.RttManager.Capabilities getCapabilities();
		method public deprecated android.net.wifi.RttManager.Capabilities getCapabilities();
		method public android.net.wifi.RttManager.RttCapabilities getRttCapabilities();
		method public void startRanging(android.net.wifi.RttManager.RttParams[], android.net.wifi.RttManager.RttListener);
		method public void stopRanging(android.net.wifi.RttManager.RttListener);
		field public static final int BASE = 160256; // 0x27200
		@@ -20122,10 +20124,19 @@ package android.net.wifi {
		field public static final int CMD_OP_STOP_RANGING = 160257; // 0x27201
		field public static final int CMD_OP_SUCCEEDED = 160259; // 0x27203
		field public static final java.lang.String DESCRIPTION_KEY = "android.net.wifi.RttManager.Description";
		field public static final int PREAMBLE_HT = 2; // 0x2
		field public static final int PREAMBLE_LEGACY = 1; // 0x1
		field public static final int PREAMBLE_VHT = 4; // 0x4
		field public static final int REASON_INVALID_LISTENER = -3; // 0xfffffffd
		field public static final int REASON_INVALID_REQUEST = -4; // 0xfffffffc
		field public static final int REASON_NOT_AVAILABLE = -2; // 0xfffffffe
		field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff
		field public static final int RTT_BW_10_SUPPORT = 2; // 0x2
		field public static final int RTT_BW_160_SUPPORT = 32; // 0x20
		field public static final int RTT_BW_20_SUPPORT = 4; // 0x4
		field public static final int RTT_BW_40_SUPPORT = 8; // 0x8
		field public static final int RTT_BW_5_SUPPORT = 1; // 0x1
		field public static final int RTT_BW_80_SUPPORT = 16; // 0x10
		field public static final int RTT_CHANNEL_WIDTH_10 = 6; // 0x6
		field public static final int RTT_CHANNEL_WIDTH_160 = 3; // 0x3
		field public static final int RTT_CHANNEL_WIDTH_20 = 0; // 0x0
		@@ -20133,26 +20144,31 @@ package android.net.wifi {
		field public static final int RTT_CHANNEL_WIDTH_5 = 5; // 0x5
		field public static final int RTT_CHANNEL_WIDTH_80 = 2; // 0x2
		field public static final int RTT_CHANNEL_WIDTH_80P80 = 4; // 0x4
		field public static final int RTT_CHANNEL_WIDTH_UNSPECIFIED = -1; // 0xffffffff
		field public static final deprecated int RTT_CHANNEL_WIDTH_UNSPECIFIED = -1; // 0xffffffff
		field public static final int RTT_PEER_TYPE_AP = 1; // 0x1
		field public static final int RTT_PEER_TYPE_STA = 2; // 0x2
		field public static final int RTT_PEER_TYPE_UNSPECIFIED = 0; // 0x0
		field public static final int RTT_STATUS_ABORTED = 8; // 0x8
		field public static final int RTT_STATUS_FAILURE = 1; // 0x1
		field public static final int RTT_STATUS_FAIL_AP_ON_DIFF_CHANNEL = 6; // 0x6
		field public static final int RTT_STATUS_FAIL_BUSY_TRY_LATER = 12; // 0xc
		field public static final int RTT_STATUS_FAIL_INVALID_TS = 9; // 0x9
		field public static final int RTT_STATUS_FAIL_NOT_SCHEDULED_YET = 4; // 0x4
		field public static final int RTT_STATUS_FAIL_NO_CAPABILITY = 7; // 0x7
		field public static final int RTT_STATUS_FAIL_NO_RSP = 2; // 0x2
		field public static final int RTT_STATUS_FAIL_PROTOCOL = 10; // 0xa
		field public static final int RTT_STATUS_FAIL_REJECTED = 3; // 0x3
		field public static final int RTT_STATUS_FAIL_SCHEDULE = 11; // 0xb
		field public static final int RTT_STATUS_FAIL_TM_TIMEOUT = 5; // 0x5
		field public static final int RTT_STATUS_SUCCESS = 0; // 0x0
		field public static final int RTT_TYPE_11_MC = 4; // 0x4
		field public static final int RTT_TYPE_11_V = 2; // 0x2
		field public static final deprecated int RTT_TYPE_11_MC = 4; // 0x4
		field public static final deprecated int RTT_TYPE_11_V = 2; // 0x2
		field public static final int RTT_TYPE_ONE_SIDED = 1; // 0x1
		field public static final int RTT_TYPE_UNSPECIFIED = 0; // 0x0
		field public static final int RTT_TYPE_TWO_SIDED = 4; // 0x4
		field public static final deprecated int RTT_TYPE_UNSPECIFIED = 0; // 0x0
		}

		public class RttManager.Capabilities {
		public deprecated class RttManager.Capabilities {
		ctor public RttManager.Capabilities();
		field public int supportedPeerType;
		field public int supportedType;
		@@ -20171,6 +20187,20 @@ package android.net.wifi {
		field public android.net.wifi.RttManager.RttResult[] mResults;
		}

		public static class RttManager.RttCapabilities implements android.os.Parcelable {
		ctor public RttManager.RttCapabilities();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public int bwSupported;
		field public boolean lciSupported;
		field public boolean lcrSupported;
		field public boolean oneSidedRttSupported;
		field public int preambleSupported;
		field public deprecated boolean supportedPeerType;
		field public deprecated boolean supportedType;
		field public boolean twoSided11McRttSupported;
		}

		public static abstract interface RttManager.RttListener {
		method public abstract void onAborted();
		method public abstract void onFailure(int, java.lang.String);
		@@ -20179,30 +20209,64 @@ package android.net.wifi {

		public static class RttManager.RttParams {
		ctor public RttManager.RttParams();
		field public boolean LCIRequest;
		field public boolean LCRRequest;
		field public int bandwidth;
		field public java.lang.String bssid;
		field public int burstTimeout;
		field public int centerFreq0;
		field public int centerFreq1;
		field public int channelWidth;
		field public int deviceType;
		field public int frequency;
		field public int num_retries;
		field public int num_samples;
		field public int interval;
		field public int numRetriesPerFTMR;
		field public int numRetriesPerMeasurementFrame;
		field public int numSamplesPerBurst;
		field public deprecated int num_retries;
		field public deprecated int num_samples;
		field public int numberBurst;
		field public int preamble;
		field public int requestType;
		}

		public static class RttManager.RttResult {
		ctor public RttManager.RttResult();
		field public java.lang.String bssid;
		field public int distance_cm;
		field public int distance_sd_cm;
		field public int distance_spread_cm;
		field public int requestType;
		field public int burstDuration;
		field public int burstNumber;
		field public int distance;
		field public int distanceSpread;
		field public int distanceStandardDeviation;
		field public deprecated int distance_cm;
		field public deprecated int distance_sd_cm;
		field public deprecated int distance_spread_cm;
		field public int frameNumberPerBurstPeer;
		field public int measurementFrameNumber;
		field public int measurementType;
		field public deprecated int requestType;
		field public int retryAfterDuration;
		field public int rssi;
		field public int rssi_spread;
		field public long rtt_ns;
		field public long rtt_sd_ns;
		field public long rtt_spread_ns;
		field public int rssiSpread;
		field public deprecated int rssi_spread;
		field public long rtt;
		field public long rttSpread;
		field public long rttStandardDeviation;
		field public deprecated long rtt_ns;
		field public deprecated long rtt_sd_ns;
		field public deprecated long rtt_spread_ns;
		field public int rxRate;
		field public int status;
		field public int successMeasurementFrameNumber;
		field public long ts;
		field public int tx_rate;
		field public int txRate;
		field public deprecated int tx_rate;
		}

		public class RttManager.wifiInformationElement {
		ctor public RttManager.wifiInformationElement();
		field public java.lang.String data;
		field public int id;
		}

		public class ScanResult implements android.os.Parcelable {
		@@ -20222,7 +20286,10 @@ package android.net.wifi {
		field public int frequency;
		field public boolean is80211McRTTResponder;
		field public int level;
		field public java.lang.String operatorFriendlyName;
		field public boolean passpointNetwork;
		field public long timestamp;
		field public java.lang.String venueName;
		}

		public final class SupplicantState extends java.lang.Enum implements android.os.Parcelable {
		@@ -20249,6 +20316,7 @@ package android.net.wifi {
		public class WifiConfiguration implements android.os.Parcelable {
		ctor public WifiConfiguration();
		method public int describeContents();
		method public boolean isPasspoint();
		method public void writeToParcel(android.os.Parcel, int);
		field public java.lang.String BSSID;
		field public java.lang.String FQDN;

core/java/android/bluetooth/le/ScanSettings.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,13 @@ import android.os.Parcelable;
		* parameters for the scan.
		*/
		public final class ScanSettings implements Parcelable {

		/**
		* A special Bluetooth LE scan mode. Applications using this scan mode will passively listen for
		* other scan results without starting BLE scans themselves.
		*/
		public static final int SCAN_MODE_OPPORTUNISTIC = -1;

		/**
		* Perform Bluetooth LE scan in low power mode. This is the default scan mode as it consumes the
		* least power.
		@@ -177,7 +184,7 @@ public final class ScanSettings implements Parcelable {
		* @throws IllegalArgumentException If the {@code scanMode} is invalid.
		*/
		public Builder setScanMode(int scanMode) {
		if (scanMode < SCAN_MODE_LOW_POWER \|\| scanMode > SCAN_MODE_LOW_LATENCY) {
		if (scanMode < SCAN_MODE_OPPORTUNISTIC \|\| scanMode > SCAN_MODE_LOW_LATENCY) {
		throw new IllegalArgumentException("invalid scan mode " + scanMode);
		}
		mScanMode = scanMode;

core/java/android/net/ConnectivityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2337,7 +2337,7 @@ public class ConnectivityManager {
		* successfully finding a network for the applications request. Retrieve it with
		* {@link android.content.Intent#getParcelableExtra(String)}.
		* <p>
		* Note that if you intend to invoke (@link #setProcessDefaultNetwork(Network)) or
		* Note that if you intend to invoke {@link #setProcessDefaultNetwork} or
		* {@link Network#openConnection(java.net.URL)} then you must get a
		* ConnectivityManager instance before doing so.
		*/

core/java/android/net/NetworkCapabilities.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -148,9 +148,9 @@ public final class NetworkCapabilities implements Parcelable {
		*/
		public static final int NET_CAPABILITY_TRUSTED = 14;

		/*
		/**
		* Indicates that this network is not a VPN. This capability is set by default and should be
		* explicitly cleared when creating VPN networks.
		* explicitly cleared for VPN networks.
		*/
		public static final int NET_CAPABILITY_NOT_VPN = 15;