Merge "[WIFICOND] Formalize the wificond AIDL interface" (195a4f72) · Commits · e / os / android_frameworks_base

api/system-current.txt

+124 −0

Original line number	Diff line number	Diff line
		@@ -6251,6 +6251,130 @@ package android.net.wifi.rtt {

		}

		package android.net.wifi.wificond {

		public final class NativeScanResult implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public byte[] getBssid();
		method @NonNull public java.util.BitSet getCapabilities();
		method public int getFrequencyMhz();
		method @NonNull public byte[] getInformationElements();
		method @NonNull public java.util.List<android.net.wifi.wificond.RadioChainInfo> getRadioChainInfos();
		method public int getSignalMbm();
		method @NonNull public byte[] getSsid();
		method public long getTsf();
		method public boolean isAssociated();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.NativeScanResult> CREATOR;
		}

		public final class NativeWifiClient implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.NativeWifiClient> CREATOR;
		field @NonNull public final byte[] macAddress;
		}

		public final class PnoNetwork implements android.os.Parcelable {
		ctor public PnoNetwork();
		method public int describeContents();
		method @NonNull public int[] getFrequenciesMhz();
		method @NonNull public byte[] getSsid();
		method public boolean isHidden();
		method public void setFrequenciesMhz(@NonNull int[]);
		method public void setHidden(boolean);
		method public void setSsid(@NonNull byte[]);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.PnoNetwork> CREATOR;
		}

		public final class PnoSettings implements android.os.Parcelable {
		ctor public PnoSettings();
		method public int describeContents();
		method public int getIntervalMillis();
		method public int getMin2gRssiDbm();
		method public int getMin5gRssiDbm();
		method public int getMin6gRssiDbm();
		method @NonNull public java.util.List<android.net.wifi.wificond.PnoNetwork> getPnoNetworks();
		method public void setIntervalMillis(int);
		method public void setMin2gRssiDbm(int);
		method public void setMin5gRssiDbm(int);
		method public void setMin6gRssiDbm(int);
		method public void setPnoNetworks(@NonNull java.util.List<android.net.wifi.wificond.PnoNetwork>);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.PnoSettings> CREATOR;
		}

		public final class RadioChainInfo implements android.os.Parcelable {
		method public int describeContents();
		method public int getChainId();
		method public int getLevelDbm();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.RadioChainInfo> CREATOR;
		}

		public class WifiCondManager {
		method public void abortScan(@NonNull String);
		method public void enableVerboseLogging(boolean);
		method @NonNull public int[] getChannelsMhzForBand(int);
		method @NonNull public java.util.List<android.net.wifi.wificond.NativeScanResult> getScanResults(@NonNull String, int);
		method @Nullable public android.net.wifi.wificond.WifiCondManager.TxPacketCounters getTxPacketCounters(@NonNull String);
		method public boolean initialize(@NonNull Runnable);
		method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiCondManager.SoftApCallback);
		method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiCondManager.SendMgmtFrameCallback);
		method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiCondManager.ScanEventCallback, @NonNull android.net.wifi.wificond.WifiCondManager.ScanEventCallback);
		method public boolean setupInterfaceForSoftApMode(@NonNull String);
		method @Nullable public android.net.wifi.wificond.WifiCondManager.SignalPollResult signalPoll(@NonNull String);
		method public boolean startPnoScan(@NonNull String, @NonNull android.net.wifi.wificond.PnoSettings, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiCondManager.PnoScanRequestCallback);
		method public boolean startScan(@NonNull String, int, @Nullable java.util.Set<java.lang.Integer>, @Nullable java.util.List<byte[]>);
		method public boolean stopPnoScan(@NonNull String);
		method public boolean tearDownClientInterface(@NonNull String);
		method public boolean tearDownInterfaces();
		method public boolean tearDownSoftApInterface(@NonNull String);
		field public static final int SCAN_TYPE_PNO_SCAN = 1; // 0x1
		field public static final int SCAN_TYPE_SINGLE_SCAN = 0; // 0x0
		field public static final int SEND_MGMT_FRAME_ERROR_ALREADY_STARTED = 5; // 0x5
		field public static final int SEND_MGMT_FRAME_ERROR_MCS_UNSUPPORTED = 2; // 0x2
		field public static final int SEND_MGMT_FRAME_ERROR_NO_ACK = 3; // 0x3
		field public static final int SEND_MGMT_FRAME_ERROR_TIMEOUT = 4; // 0x4
		field public static final int SEND_MGMT_FRAME_ERROR_UNKNOWN = 1; // 0x1
		}

		public static interface WifiCondManager.PnoScanRequestCallback {
		method public void onPnoRequestFailed();
		method public void onPnoRequestSucceeded();
		}

		public static interface WifiCondManager.ScanEventCallback {
		method public void onScanFailed();
		method public void onScanResultReady();
		}

		public static interface WifiCondManager.SendMgmtFrameCallback {
		method public void onAck(int);
		method public void onFailure(int);
		}

		public static class WifiCondManager.SignalPollResult {
		field public final int associationFrequencyMHz;
		field public final int currentRssiDbm;
		field public final int rxBitrateMbps;
		field public final int txBitrateMbps;
		}

		public static interface WifiCondManager.SoftApCallback {
		method public void onConnectedClientsChanged(@NonNull android.net.wifi.wificond.NativeWifiClient, boolean);
		method public void onFailure();
		method public void onSoftApChannelSwitched(int, int);
		}

		public static class WifiCondManager.TxPacketCounters {
		field public final int txPacketFailed;
		field public final int txPacketSucceeded;
		}

		}

		package android.nfc {

		public final class NfcAdapter {

api/system-lint-baseline.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@ ExecutorRegistration: android.net.wifi.p2p.WifiP2pManager#setWfdInfo(android.net
		ExecutorRegistration: android.net.wifi.p2p.WifiP2pManager#setWifiP2pChannels(android.net.wifi.p2p.WifiP2pManager.Channel, int, int, android.net.wifi.p2p.WifiP2pManager.ActionListener):
		Registration methods should have overload that accepts delivery Executor: `setWifiP2pChannels`

		HeavyBitSet: android.net.wifi.wificond.NativeScanResult#getCapabilities():
		Type must not be heavy BitSet (method android.net.wifi.wificond.NativeScanResult.getCapabilities())
		PairedRegistration: android.net.wifi.wificond.WifiCondManager#registerApCallback(String, java.util.concurrent.Executor, android.net.wifi.wificond.WifiCondManager.SoftApCallback):
		Found registerApCallback but not unregisterApCallback in android.net.wifi.wificond.WifiCondManager


		GenericException: android.app.prediction.AppPredictor#finalize():

core/java/android/app/SystemServiceRegistry.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,8 +120,8 @@ import android.net.lowpan.ILowpanManager;
		import android.net.lowpan.LowpanManager;
		import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.WifiCondManager;
		import android.net.wifi.WifiFrameworkInitializer;
		import android.net.wifi.wificond.WifiCondManager;
		import android.nfc.NfcManager;
		import android.os.BatteryManager;
		import android.os.BatteryStats;

wifi/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ filegroup {
		// framework-wifi.jar. This is not a good idea, should move WifiNetworkScoreCache
		// to a separate package.
		"java/android/net/wifi/WifiNetworkScoreCache.java",
		"java/android/net/wifi/WifiCondManager.java",
		"java/android/net/wifi/wificond/*.java",
		":libwificond_ipc_aidl",
		],

wifi/java/android/net/wifi/SoftApInfo.java

+4 −21

Original line number	Diff line number	Diff line
		@@ -16,15 +16,12 @@

		package android.net.wifi;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.Objects;

		/**
		@@ -85,26 +82,12 @@ public final class SoftApInfo implements Parcelable {
		*/
		public static final int CHANNEL_WIDTH_160MHZ = 6;

		/**
		* @hide
		*/
		@IntDef(prefix = { "CHANNEL_WIDTH_" }, value = {
		CHANNEL_WIDTH_INVALID,
		CHANNEL_WIDTH_20MHZ_NOHT,
		CHANNEL_WIDTH_20MHZ,
		CHANNEL_WIDTH_40MHZ,
		CHANNEL_WIDTH_80MHZ,
		CHANNEL_WIDTH_80MHZ_PLUS_MHZ,
		CHANNEL_WIDTH_160MHZ,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Bandwidth {}


		/** The frequency which AP resides on. */
		private int mFrequency = 0;

		@Bandwidth
		@WifiAnnotations.Bandwidth
		private int mBandwidth = CHANNEL_WIDTH_INVALID;

		/**
		@@ -127,9 +110,9 @@ public final class SoftApInfo implements Parcelable {
		*
		* @return One of {@link #CHANNEL_WIDTH_20MHZ}, {@link #CHANNEL_WIDTH_40MHZ},
		* {@link #CHANNEL_WIDTH_80MHZ}, {@link #CHANNEL_WIDTH_160MHZ},
		* {@link #CHANNEL_WIDTH_80MHZ_PLUS_MHZ} or {@link #CHANNEL_WIDTH_UNKNOWN}.
		* {@link #CHANNEL_WIDTH_80MHZ_PLUS_MHZ} or {@link #CHANNEL_WIDTH_INVALID}.
		*/
		@Bandwidth
		@WifiAnnotations.Bandwidth
		public int getBandwidth() {
		return mBandwidth;
		}
		@@ -138,7 +121,7 @@ public final class SoftApInfo implements Parcelable {
		* Set AP Channel bandwidth.
		* @hide
		*/
		public void setBandwidth(@Bandwidth int bandwidth) {
		public void setBandwidth(@WifiAnnotations.Bandwidth int bandwidth) {
		mBandwidth = bandwidth;
		}