Merge "[WIFICOND] Rename to nl80211" (ee9f1279) · Commits · e / os / android_frameworks_base

api/system-current.txt

+17 −17

Original line number	Diff line number	Diff line
		@@ -1809,7 +1809,7 @@ package android.content {
		field public static final String TELEPHONY_REGISTRY_SERVICE = "telephony_registry";
		field public static final String TETHERING_SERVICE = "tethering";
		field public static final String VR_SERVICE = "vrmanager";
		field public static final String WIFI_COND_SERVICE = "wificond";
		field public static final String WIFI_NL80211_SERVICE = "wifinl80211";
		field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";
		field public static final String WIFI_SCANNING_SERVICE = "wifiscanner";
		}
		@@ -8329,21 +8329,21 @@ package android.net.wifi.wificond {
		field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.wificond.RadioChainInfo> CREATOR;
		}

		public class WifiCondManager {
		public class WifiNl80211Manager {
		method public void abortScan(@NonNull String);
		method public void enableVerboseLogging(boolean);
		method @NonNull public int[] getChannelsMhzForBand(int);
		method @Nullable public android.net.wifi.wificond.DeviceWiphyCapabilities getDeviceWiphyCapabilities(@NonNull String);
		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 @Nullable public static android.net.wifi.wificond.WifiCondManager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);
		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 @Nullable public android.net.wifi.wificond.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);
		method @Nullable public static android.net.wifi.wificond.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);
		method public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.SoftApCallback);
		method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.SendMgmtFrameCallback);
		method public void setOnServiceDeadCallback(@NonNull Runnable);
		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 setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.wificond.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.wificond.WifiNl80211Manager.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 @Nullable public android.net.wifi.wificond.WifiNl80211Manager.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.WifiNl80211Manager.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);
		@@ -8358,43 +8358,43 @@ package android.net.wifi.wificond {
		field public static final int SEND_MGMT_FRAME_ERROR_UNKNOWN = 1; // 0x1
		}

		public static class WifiCondManager.OemSecurityType {
		ctor public WifiCondManager.OemSecurityType(int, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>, int);
		public static class WifiNl80211Manager.OemSecurityType {
		ctor public WifiNl80211Manager.OemSecurityType(int, @NonNull java.util.List<java.lang.Integer>, @NonNull java.util.List<java.lang.Integer>, int);
		field public final int groupCipher;
		field @NonNull public final java.util.List<java.lang.Integer> keyManagement;
		field @NonNull public final java.util.List<java.lang.Integer> pairwiseCipher;
		field public final int protocol;
		}

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

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

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

		public static class WifiCondManager.SignalPollResult {
		public static class WifiNl80211Manager.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 {
		public static interface WifiNl80211Manager.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 {
		public static class WifiNl80211Manager.TxPacketCounters {
		field public final int txPacketFailed;
		field public final int txPacketSucceeded;
		}

api/system-lint-baseline.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ OnNameExpected: android.content.ContentProvider#checkUriPermission(android.net.U
		If implemented by developer, should follow the on<Something> style; otherwise consider marking final


		PairedRegistration: android.net.wifi.wificond.WifiCondManager#registerApCallback(String, java.util.concurrent.Executor, android.net.wifi.wificond.WifiCondManager.SoftApCallback):
		PairedRegistration: android.net.wifi.wificond.WifiNl80211Manager#registerApCallback(String, java.util.concurrent.Executor, android.net.wifi.wificond.WifiNl80211Manager.SoftApCallback):

core/java/android/app/SystemServiceRegistry.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ import android.net.lowpan.LowpanManager;
		import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.WifiFrameworkInitializer;
		import android.net.wifi.wificond.WifiCondManager;
		import android.net.wifi.wificond.WifiNl80211Manager;
		import android.nfc.NfcManager;
		import android.os.BatteryManager;
		import android.os.BatteryStats;
		@@ -761,11 +761,11 @@ public final class SystemServiceRegistry {
		return new EthernetManager(ctx.getOuterContext(), service);
		}});

		registerService(Context.WIFI_COND_SERVICE, WifiCondManager.class,
		new CachedServiceFetcher<WifiCondManager>() {
		registerService(Context.WIFI_NL80211_SERVICE, WifiNl80211Manager.class,
		new CachedServiceFetcher<WifiNl80211Manager>() {
		@Override
		public WifiCondManager createService(ContextImpl ctx) {
		return new WifiCondManager(ctx.getOuterContext());
		public WifiNl80211Manager createService(ContextImpl ctx) {
		return new WifiNl80211Manager(ctx.getOuterContext());
		}
		});

core/java/android/content/Context.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -4064,16 +4064,16 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.net.wifi.WifiCondManager} for handling management of the Wi-Fi control
		* daemon.
		* {@link android.net.wifi.wificond.WifiNl80211Manager} for handling management of the
		* Wi-Fi nl802.11 daemon (wificond).
		*
		* @see #getSystemService(String)
		* @see android.net.wifi.WifiCondManager
		* @see android.net.wifi.wificond.WifiNl80211Manager
		* @hide
		*/
		@SystemApi
		@SuppressLint("ServiceName")
		public static final String WIFI_COND_SERVICE = "wificond";
		public static final String WIFI_NL80211_SERVICE = "wifinl80211";

		/**
		* Use with {@link #getSystemService(String)} to retrieve a {@link

wifi/java/android/net/wifi/wificond/WifiCondManager.java→wifi/java/android/net/wifi/wificond/WifiNl80211Manager.java

+10 −9

Original line number	Diff line number	Diff line
		@@ -49,15 +49,16 @@ import java.util.concurrent.Executor;
		import java.util.concurrent.atomic.AtomicBoolean;

		/**
		* This class encapsulates the interface the wificond daemon presents to the Wi-Fi framework. The
		* This class encapsulates the interface the wificond daemon presents to the Wi-Fi framework - used
		* to encapsulate the Wi-Fi 80211nl management interface. The
		* interface is only for use by the Wi-Fi framework and access is protected by SELinux permissions.
		*
		* @hide
		*/
		@SystemApi
		@SystemService(Context.WIFI_COND_SERVICE)
		public class WifiCondManager {
		private static final String TAG = "WifiCondManager";
		@SystemService(Context.WIFI_NL80211_SERVICE)
		public class WifiNl80211Manager {
		private static final String TAG = "WifiNl80211Manager";
		private boolean mVerboseLoggingEnabled = false;

		/**
		@@ -316,14 +317,14 @@ public class WifiCondManager {
		public static final int SEND_MGMT_FRAME_ERROR_ALREADY_STARTED = 5;

		/** @hide */
		public WifiCondManager(Context context) {
		public WifiNl80211Manager(Context context) {
		mAlarmManager = context.getSystemService(AlarmManager.class);
		mEventHandler = new Handler(context.getMainLooper());
		}

		/** @hide */
		@VisibleForTesting
		public WifiCondManager(Context context, IWificond wificond) {
		public WifiNl80211Manager(Context context, IWificond wificond) {
		this(context);
		mWificond = wificond;
		}
		@@ -485,7 +486,7 @@ public class WifiCondManager {
		}

		/**
		* Enable or disable verbose logging of the WifiCondManager module.
		* Enable or disable verbose logging of the WifiNl80211Manager module.
		* @param enable True to enable verbose logging. False to disable verbose logging.
		*/
		public void enableVerboseLogging(boolean enable) {
		@@ -493,7 +494,7 @@ public class WifiCondManager {
		}

		/**
		* Register a death notification for the WifiCondManager which acts as a proxy for the
		* Register a death notification for the WifiNl80211Manager which acts as a proxy for the
		* wificond daemon (i.e. the death listener will be called when and if the wificond daemon
		* dies).
		*
		@@ -518,7 +519,7 @@ public class WifiCondManager {
		// We already have a wificond handle.
		return true;
		}
		IBinder binder = ServiceManager.getService(Context.WIFI_COND_SERVICE);
		IBinder binder = ServiceManager.getService(Context.WIFI_NL80211_SERVICE);
		mWificond = IWificond.Stub.asInterface(binder);
		if (mWificond == null) {
		Log.e(TAG, "Failed to get reference to wificond");