Merge "wifi: Rename country change API" into sc-dev (d055f6d8) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -7861,7 +7861,7 @@ package android.net.wifi.nl80211 {
		method @Nullable public android.net.wifi.nl80211.WifiNl80211Manager.TxPacketCounters getTxPacketCounters(@NonNull String);
		method @Nullable public static android.net.wifi.nl80211.WifiNl80211Manager.OemSecurityType parseOemSecurityTypeElement(int, int, @NonNull byte[]);
		method @Deprecated public boolean registerApCallback(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SoftApCallback);
		method public boolean registerCountryCodeChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangeListener);
		method public boolean registerCountryCodeChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangedListener);
		method public void sendMgmtFrame(@NonNull String, @NonNull byte[], int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.SendMgmtFrameCallback);
		method public void setOnServiceDeadCallback(@NonNull Runnable);
		method public boolean setupInterfaceForClientMode(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback, @NonNull android.net.wifi.nl80211.WifiNl80211Manager.ScanEventCallback);
		@@ -7874,7 +7874,7 @@ package android.net.wifi.nl80211 {
		method public boolean tearDownClientInterface(@NonNull String);
		method public boolean tearDownInterfaces();
		method public boolean tearDownSoftApInterface(@NonNull String);
		method public void unregisterCountryCodeChangeListener(@NonNull android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangeListener);
		method public void unregisterCountryCodeChangedListener(@NonNull android.net.wifi.nl80211.WifiNl80211Manager.CountryCodeChangedListener);
		field public static final String SCANNING_PARAM_ENABLE_6GHZ_RNR = "android.net.wifi.nl80211.SCANNING_PARAM_ENABLE_6GHZ_RNR";
		field public static final int SCAN_TYPE_PNO_SCAN = 1; // 0x1
		field public static final int SCAN_TYPE_SINGLE_SCAN = 0; // 0x0
		@@ -7885,8 +7885,8 @@ package android.net.wifi.nl80211 {
		field public static final int SEND_MGMT_FRAME_ERROR_UNKNOWN = 1; // 0x1
		}

		public static interface WifiNl80211Manager.CountryCodeChangeListener {
		method public void onChanged(@NonNull String);
		public static interface WifiNl80211Manager.CountryCodeChangedListener {
		method public void onCountryCodeChanged(@NonNull String);
		}

		public static class WifiNl80211Manager.OemSecurityType {

wifi/java/src/android/net/wifi/nl80211/WifiNl80211Manager.java

+19 −19

Original line number	Diff line number	Diff line
		@@ -117,13 +117,13 @@ public class WifiNl80211Manager {
		/**
		* Interface used to listen country code event
		*/
		public interface CountryCodeChangeListener {
		public interface CountryCodeChangedListener {
		/**
		* Called when country code changed.
		*
		* @param countryCode A new country code which is 2-Character alphanumeric.
		* @param countryCode An ISO-3166-alpha2 country code which is 2-Character alphanumeric.
		*/
		void onChanged(@NonNull String countryCode);
		void onCountryCodeChanged(@NonNull String countryCode);
		}

		/**
		@@ -163,27 +163,27 @@ public class WifiNl80211Manager {
		/** @hide */
		@VisibleForTesting
		public class WificondEventHandler extends IWificondEventCallback.Stub {
		private Map<CountryCodeChangeListener, Executor> mCountryCodeChangeListenerHolder =
		private Map<CountryCodeChangedListener, Executor> mCountryCodeChangedListenerHolder =
		new HashMap<>();

		/**
		* Register CountryCodeChangeListener with pid.
		* Register CountryCodeChangedListener with pid.
		*
		* @param executor The Executor on which to execute the callbacks.
		* @param listener listener for country code changed events.
		*/
		public void registerCountryCodeChangeListener(Executor executor,
		CountryCodeChangeListener listener) {
		mCountryCodeChangeListenerHolder.put(listener, executor);
		public void registerCountryCodeChangedListener(Executor executor,
		CountryCodeChangedListener listener) {
		mCountryCodeChangedListenerHolder.put(listener, executor);
		}

		/**
		* Unregister CountryCodeChangeListener with pid.
		* Unregister CountryCodeChangedListener with pid.
		*
		* @param listener listener which registered country code changed events.
		*/
		public void unregisterCountryCodeChangeListener(CountryCodeChangeListener listener) {
		mCountryCodeChangeListenerHolder.remove(listener);
		public void unregisterCountryCodeChangedListener(CountryCodeChangedListener listener) {
		mCountryCodeChangedListenerHolder.remove(listener);
		}

		@Override
		@@ -191,8 +191,8 @@ public class WifiNl80211Manager {
		Log.d(TAG, "OnRegDomainChanged " + countryCode);
		final long token = Binder.clearCallingIdentity();
		try {
		mCountryCodeChangeListenerHolder.forEach((listener, executor) -> {
		executor.execute(() -> listener.onChanged(countryCode));
		mCountryCodeChangedListenerHolder.forEach((listener, executor) -> {
		executor.execute(() -> listener.onCountryCodeChanged(countryCode));
		});
		} finally {
		Binder.restoreCallingIdentity(token);
		@@ -1240,25 +1240,25 @@ public class WifiNl80211Manager {
		* @param listener listener for country code changed events.
		* @return true on success, false on failure.
		*/
		public boolean registerCountryCodeChangeListener(@NonNull @CallbackExecutor Executor executor,
		@NonNull CountryCodeChangeListener listener) {
		public boolean registerCountryCodeChangedListener(@NonNull @CallbackExecutor Executor executor,
		@NonNull CountryCodeChangedListener listener) {
		if (!retrieveWificondAndRegisterForDeath()) {
		return false;
		}
		Log.d(TAG, "registerCountryCodeEventListener called");
		mWificondEventHandler.registerCountryCodeChangeListener(executor, listener);
		mWificondEventHandler.registerCountryCodeChangedListener(executor, listener);
		return true;
		}


		/**
		* Unregister CountryCodeChangeListener with pid.
		* Unregister CountryCodeChangedListener with pid.
		*
		* @param listener listener which registered country code changed events.
		*/
		public void unregisterCountryCodeChangeListener(@NonNull CountryCodeChangeListener listener) {
		public void unregisterCountryCodeChangedListener(@NonNull CountryCodeChangedListener listener) {
		Log.d(TAG, "unregisterCountryCodeEventListener called");
		mWificondEventHandler.unregisterCountryCodeChangeListener(listener);
		mWificondEventHandler.unregisterCountryCodeChangedListener(listener);
		}

		/**

wifi/tests/src/android/net/wifi/nl80211/WifiNl80211ManagerTest.java

+15 −15

Original line number	Diff line number	Diff line
		@@ -98,9 +98,9 @@ public class WifiNl80211ManagerTest {
		@Mock
		private WifiNl80211Manager.PnoScanRequestCallback mPnoScanRequestCallback;
		@Mock
		private WifiNl80211Manager.CountryCodeChangeListener mCountryCodeChangeListener;
		private WifiNl80211Manager.CountryCodeChangedListener mCountryCodeChangedListener;
		@Mock
		private WifiNl80211Manager.CountryCodeChangeListener mCountryCodeChangeListener2;
		private WifiNl80211Manager.CountryCodeChangedListener mCountryCodeChangedListener2;
		@Mock
		private Context mContext;
		private TestLooper mLooper;
		@@ -768,25 +768,25 @@ public class WifiNl80211ManagerTest {
		}

		/**
		* Ensures callback works after register CountryCodeChangeListener.
		* Ensures callback works after register CountryCodeChangedListener.
		*/
		@Test
		public void testCountryCodeChangeListenerInvocation() throws Exception {
		assertTrue(mWificondControl.registerCountryCodeChangeListener(
		Runnable::run, mCountryCodeChangeListener));
		assertTrue(mWificondControl.registerCountryCodeChangeListener(
		Runnable::run, mCountryCodeChangeListener2));
		public void testCountryCodeChangedListenerInvocation() throws Exception {
		assertTrue(mWificondControl.registerCountryCodeChangedListener(
		Runnable::run, mCountryCodeChangedListener));
		assertTrue(mWificondControl.registerCountryCodeChangedListener(
		Runnable::run, mCountryCodeChangedListener2));

		mWificondEventHandler.OnRegDomainChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangeListener).onChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangeListener2).onChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangedListener).onCountryCodeChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangedListener2).onCountryCodeChanged(TEST_COUNTRY_CODE);

		reset(mCountryCodeChangeListener);
		reset(mCountryCodeChangeListener2);
		mWificondControl.unregisterCountryCodeChangeListener(mCountryCodeChangeListener2);
		reset(mCountryCodeChangedListener);
		reset(mCountryCodeChangedListener2);
		mWificondControl.unregisterCountryCodeChangedListener(mCountryCodeChangedListener2);
		mWificondEventHandler.OnRegDomainChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangeListener).onChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangeListener2, never()).onChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangedListener).onCountryCodeChanged(TEST_COUNTRY_CODE);
		verify(mCountryCodeChangedListener2, never()).onCountryCodeChanged(TEST_COUNTRY_CODE);
		}

		/**