Merge "[VCN20] Change requestBackgroundNetwork argument order" into sc-dev (d07729d7) · Commits · e / os / android_frameworks_base

packages/Connectivity/framework/api/module-lib-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ package android.net {
		method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context);
		method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerDefaultNetworkCallbackAsUid(int, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
		method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public void registerSystemDefaultNetworkCallback(@NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @NonNull android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void requestBackgroundNetwork(@NonNull android.net.NetworkRequest, @NonNull android.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
		method @Deprecated public boolean requestRouteToHostAddress(int, java.net.InetAddress);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptPartialConnectivity(@NonNull android.net.Network, boolean, boolean);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void setAcceptUnvalidated(@NonNull android.net.Network, boolean, boolean);

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -5362,10 +5362,10 @@ public class ConnectivityManager {
		* {@link #unregisterNetworkCallback(NetworkCallback)}.
		*
		* @param request {@link NetworkRequest} describing this request.
		* @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
		* If null, the callback is invoked on the default internal Handler.
		* @param networkCallback The {@link NetworkCallback} to be utilized for this request. Note
		* the callback must not be shared - it uniquely specifies this request.
		* @param handler {@link Handler} to specify the thread upon which the callback will be invoked.
		* If null, the callback is invoked on the default internal Handler.
		* @throws IllegalArgumentException if {@code request} contains invalid network capabilities.
		* @throws SecurityException if missing the appropriate permissions.
		* @throws RuntimeException if the app already has too many callbacks registered.
		@@ -5380,7 +5380,8 @@ public class ConnectivityManager {
		NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK
		})
		public void requestBackgroundNetwork(@NonNull NetworkRequest request,
		@NonNull Handler handler, @NonNull NetworkCallback networkCallback) {
		@NonNull NetworkCallback networkCallback,
		@SuppressLint("ListenerLast") @NonNull Handler handler) {
		final NetworkCapabilities nc = request.networkCapabilities;
		sendRequestForNetwork(nc, networkCallback, 0, BACKGROUND_REQUEST,
		TYPE_NONE, new CallbackHandler(handler));

services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -119,18 +119,18 @@ public class UnderlyingNetworkTracker {
		if (!mIsQuitting) {
		mRouteSelectionCallback = new RouteSelectionCallback();
		mConnectivityManager.requestBackgroundNetwork(
		getRouteSelectionRequest(), mHandler, mRouteSelectionCallback);
		getRouteSelectionRequest(), mRouteSelectionCallback, mHandler);

		mWifiBringupCallback = new NetworkBringupCallback();
		mConnectivityManager.requestBackgroundNetwork(
		getWifiNetworkRequest(), mHandler, mWifiBringupCallback);
		getWifiNetworkRequest(), mWifiBringupCallback, mHandler);

		for (final int subId : mLastSnapshot.getAllSubIdsInGroup(mSubscriptionGroup)) {
		final NetworkBringupCallback cb = new NetworkBringupCallback();
		mCellBringupCallbacks.add(cb);

		mConnectivityManager.requestBackgroundNetwork(
		getCellNetworkRequestForSubId(subId), mHandler, cb);
		getCellNetworkRequestForSubId(subId), cb, mHandler);
		}
		} else {
		mRouteSelectionCallback = null;

tests/net/java/android/net/ConnectivityManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ public class ConnectivityManagerTest {
		eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE), anyInt(),
		eq(testPkgName), eq(testAttributionTag));

		manager.requestBackgroundNetwork(request, handler, callback);
		manager.requestBackgroundNetwork(request, callback, handler);
		verify(mService).requestNetwork(eq(Process.INVALID_UID), eq(request.networkCapabilities),
		eq(BACKGROUND_REQUEST.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE), anyInt(),
		eq(testPkgName), eq(testAttributionTag));

tests/net/java/com/android/server/ConnectivityServiceTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4313,7 +4313,7 @@ public class ConnectivityServiceTest {
		final TestNetworkCallback cellBgCallback = new TestNetworkCallback();
		mCm.requestBackgroundNetwork(new NetworkRequest.Builder()
		.addTransportType(TRANSPORT_CELLULAR).build(),
		mCsHandlerThread.getThreadHandler(), cellBgCallback);
		cellBgCallback, mCsHandlerThread.getThreadHandler());

		// Make callbacks for monitoring.
		final NetworkRequest request = new NetworkRequest.Builder().build();