Merge "WifiManager: remove Executor-less overloads" (b20cfac0) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -7607,11 +7607,8 @@ package android.net.wifi {
		method public boolean isPortableHotspotSupported();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();
		method public boolean isWifiScannerSupported();
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerSoftApCallback(@NonNull android.net.wifi.WifiManager.SoftApCallback);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerSoftApCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SoftApCallback);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerTrafficStateCallback(@NonNull android.net.wifi.WifiManager.TrafficStateCallback);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerTrafficStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.TrafficStateCallback);
		method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public void removeOnWifiUsabilityStatsListener(@NonNull android.net.wifi.WifiManager.OnWifiUsabilityStatsListener);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void restoreBackupData(@NonNull byte[]);

packages/SystemUI/src/com/android/systemui/statusbar/policy/WifiSignalController.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ public class WifiSignalController extends
		mWifiTracker.setListening(true);
		mHasMobileData = hasMobileData;
		if (wifiManager != null) {
		wifiManager.registerTrafficStateCallback(new WifiTrafficStateCallback());
		wifiManager.registerTrafficStateCallback(context.getMainExecutor(),
		new WifiTrafficStateCallback());
		}
		// WiFi only has one state.
		mCurrentState.iconGroup = mLastState.iconGroup = new IconGroup(

wifi/java/android/net/wifi/WifiManager.java

+0 −36

Original line number	Diff line number	Diff line
		@@ -1792,18 +1792,6 @@ public class WifiManager {
		}
		}

		/**
		* Same as {@link #registerNetworkRequestMatchCallback(Executor, NetworkRequestMatchCallback)},
		* except that the callback will be executed on the application's main thread.
		* @param callback Callback for network match events to register.
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		public void registerNetworkRequestMatchCallback(@NonNull NetworkRequestMatchCallback callback) {
		registerNetworkRequestMatchCallback(mContext.getMainExecutor(), callback);
		}

		/**
		* Registers a callback for NetworkRequest matches. See {@link NetworkRequestMatchCallback}.
		* Caller can unregister a previously registered callback using
		@@ -3718,18 +3706,6 @@ public class WifiManager {
		}
		}

		/**
		* Same as {@link #registerSoftApCallback(Executor, SoftApCallback)},
		* except that the callback will be executed on the application's main thread.
		* @param callback Callback for soft AP events
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		public void registerSoftApCallback(@NonNull SoftApCallback callback) {
		registerSoftApCallback(mContext.getMainExecutor(), callback);
		}

		/**
		* Registers a callback for Soft AP. See {@link SoftApCallback}. Caller will receive the current
		* soft AP state and number of connected devices immediately after a successful call to this API
		@@ -5151,18 +5127,6 @@ public class WifiManager {
		}
		}

		/**
		* Same as {@link #registerTrafficStateCallback(Executor, TrafficStateCallback)},
		* except that the callback will be executed on the application's main thread.
		* @param callback Callback for traffic state events
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		public void registerTrafficStateCallback(@NonNull TrafficStateCallback callback) {
		registerTrafficStateCallback(mContext.getMainExecutor(), callback);
		}

		/**
		* Registers a callback for monitoring traffic state. See {@link TrafficStateCallback}. These
		* callbacks will be invoked periodically by platform to inform clients about the current

wifi/tests/src/android/net/wifi/WifiManagerTest.java

+8 −20

Original line number	Diff line number	Diff line
		@@ -880,17 +880,6 @@ public class WifiManagerTest {
		}
		}

		/**
		* Verify main looper is used when handler is not provided.
		*/
		@Test
		public void registerSoftApCallbackUsesMainExecutorOnNoExecutorProvided() {
		when(mContext.getMainExecutor()).thenReturn(
		new HandlerExecutor(new Handler(mLooper.getLooper())));
		mWifiManager.registerSoftApCallback(mSoftApCallback);
		verify(mContext).getMainExecutor();
		}

		/**
		* Verify the call to registerSoftApCallback goes to WifiServiceImpl.
		*/
		@@ -1389,11 +1378,10 @@ public class WifiManagerTest {
		@Test
		public void registerTrafficStateCallbackUsesMainLooperOnNullArgumentForHandler()
		throws Exception {
		when(mContext.getMainExecutor()).thenReturn(
		new HandlerExecutor(new Handler(mLooper.getLooper())));
		ArgumentCaptor<ITrafficStateCallback.Stub> callbackCaptor =
		ArgumentCaptor.forClass(ITrafficStateCallback.Stub.class);
		mWifiManager.registerTrafficStateCallback(mTrafficStateCallback);
		mWifiManager.registerTrafficStateCallback(
		new HandlerExecutor(new Handler(mLooper.getLooper())), mTrafficStateCallback);
		verify(mWifiService).registerTrafficStateCallback(
		any(IBinder.class), callbackCaptor.capture(), anyInt());

		@@ -1474,11 +1462,11 @@ public class WifiManagerTest {
		@Test
		public void registerNetworkRequestMatchCallbackCallGoesToWifiServiceImpl()
		throws Exception {
		when(mContext.getMainExecutor()).thenReturn(
		new HandlerExecutor(new Handler(mLooper.getLooper())));
		ArgumentCaptor<INetworkRequestMatchCallback.Stub> callbackCaptor =
		ArgumentCaptor.forClass(INetworkRequestMatchCallback.Stub.class);
		mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback);
		mWifiManager.registerNetworkRequestMatchCallback(
		new HandlerExecutor(new Handler(mLooper.getLooper())),
		mNetworkRequestMatchCallback);
		verify(mWifiService).registerNetworkRequestMatchCallback(
		any(IBinder.class), callbackCaptor.capture(), anyInt());

		@@ -1530,11 +1518,11 @@ public class WifiManagerTest {
		@Test
		public void networkRequestUserSelectionCallbackCallGoesToWifiServiceImpl()
		throws Exception {
		when(mContext.getMainExecutor()).thenReturn(
		new HandlerExecutor(new Handler(mLooper.getLooper())));
		ArgumentCaptor<INetworkRequestMatchCallback.Stub> callbackCaptor =
		ArgumentCaptor.forClass(INetworkRequestMatchCallback.Stub.class);
		mWifiManager.registerNetworkRequestMatchCallback(mNetworkRequestMatchCallback);
		mWifiManager.registerNetworkRequestMatchCallback(
		new HandlerExecutor(new Handler(mLooper.getLooper())),
		mNetworkRequestMatchCallback);
		verify(mWifiService).registerNetworkRequestMatchCallback(
		any(IBinder.class), callbackCaptor.capture(), anyInt());