Merge "Address API review feedback" into sc-dev (f66c5cba) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/controllers/ConnectivityController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,7 +697,7 @@ public final class ConnectivityController extends RestrictingController implemen
		}
		callback.setUid(uidStats.uid);
		mCurrentDefaultNetworkCallbacks.append(uidStats.uid, callback);
		mConnManager.registerDefaultNetworkCallbackAsUid(uidStats.uid, callback, mHandler);
		mConnManager.registerDefaultNetworkCallbackForUid(uidStats.uid, callback, mHandler);
		}
		}

		@@ -794,7 +794,7 @@ public final class ConnectivityController extends RestrictingController implemen
		}
		defaultNetworkCallback.setUid(us.uid);
		mCurrentDefaultNetworkCallbacks.append(us.uid, defaultNetworkCallback);
		mConnManager.registerDefaultNetworkCallbackAsUid(
		mConnManager.registerDefaultNetworkCallbackForUid(
		us.uid, defaultNetworkCallback, mHandler);
		}
		}

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ package android.net {
		method @Nullable public android.net.ProxyInfo getGlobalProxy();
		method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
		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 registerDefaultNetworkCallbackForUid(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.net.ConnectivityManager.NetworkCallback, @NonNull android.os.Handler);
		method @Deprecated public boolean requestRouteToHostAddress(int, java.net.InetAddress);
		@@ -166,11 +166,11 @@ package android.net {
		public final class VpnTransportInfo implements android.os.Parcelable android.net.TransportInfo {
		ctor public VpnTransportInfo(int, @Nullable String);
		method public int describeContents();
		method @Nullable public String getSessionId();
		method public int getType();
		method @NonNull public android.net.VpnTransportInfo makeCopy(long);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR;
		field @Nullable public final String sessionId;
		field public final int type;
		}

		}

packages/Connectivity/framework/api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ package android.net {
		method public final void sendSocketKeepaliveEvent(int, int);
		method @Deprecated public void setLegacySubtype(int, @NonNull String);
		method public void setLingerDuration(@NonNull java.time.Duration);
		method public void setTeardownDelayMs(@IntRange(from=0, to=0x1388) int);
		method public void setTeardownDelayMillis(@IntRange(from=0, to=0x1388) int);
		method public final void setUnderlyingNetworks(@Nullable java.util.List<android.net.Network>);
		method public void unregister();
		field public static final int VALIDATION_STATUS_NOT_VALID = 2; // 0x2

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -4473,7 +4473,7 @@ public class ConnectivityManager {
		@RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE)
		public void registerDefaultNetworkCallback(@NonNull NetworkCallback networkCallback,
		@NonNull Handler handler) {
		registerDefaultNetworkCallbackAsUid(Process.INVALID_UID, networkCallback, handler);
		registerDefaultNetworkCallbackForUid(Process.INVALID_UID, networkCallback, handler);
		}

		/**
		@@ -4503,7 +4503,7 @@ public class ConnectivityManager {
		@RequiresPermission(anyOf = {
		NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK,
		android.Manifest.permission.NETWORK_SETTINGS})
		public void registerDefaultNetworkCallbackAsUid(int uid,
		public void registerDefaultNetworkCallbackForUid(int uid,
		@NonNull NetworkCallback networkCallback, @NonNull Handler handler) {
		CallbackHandler cbHandler = new CallbackHandler(handler);
		sendRequestForNetwork(uid, null /* need /, networkCallback, 0 / timeoutMs */,

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -892,11 +892,11 @@ public abstract class NetworkAgent {
		* This method may be called at any time while the network is connected. It has no effect if
		* the network is already disconnected and the teardown delay timer is running.
		*
		* @param teardownDelayMs the teardown delay to set, or 0 to disable teardown delay.
		* @param teardownDelayMillis the teardown delay to set, or 0 to disable teardown delay.
		*/
		public void setTeardownDelayMs(
		@IntRange(from = 0, to = MAX_TEARDOWN_DELAY_MS) int teardownDelayMs) {
		queueOrSendMessage(reg -> reg.sendTeardownDelayMs(teardownDelayMs));
		public void setTeardownDelayMillis(
		@IntRange(from = 0, to = MAX_TEARDOWN_DELAY_MS) int teardownDelayMillis) {
		queueOrSendMessage(reg -> reg.sendTeardownDelayMs(teardownDelayMillis));
		}

		/**