Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address API review feedback" am: 13e89b75d3 am: 9d2158a9bf

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679763

Change-Id: I39de2c7701114faa0bf699a2fdb725a57188886a
This commit is contained in:
Chiachang Wang
2021-04-26 01:15:12 +00:00
committed by Automerger Merge Worker
parent f9215ba0ef 9d2158a9bf
commit 786bf2e9bc
10 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Connectivity/framework/api/module-lib-current.txt
View File

@@ -11,7 +11,7 @@ package android.net {
method @Nullable public android.net.ProxyInfo getGlobalProxy(); method @Nullable public android.net.ProxyInfo getGlobalProxy();
method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange(); method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context); 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.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 @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 @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 { public final class VpnTransportInfo implements android.os.Parcelable android.net.TransportInfo {
ctor public VpnTransportInfo(int, @Nullable String); ctor public VpnTransportInfo(int, @Nullable String);
method public int describeContents(); method public int describeContents();
method @Nullable public String getSessionId();
method public int getType();
method @NonNull public android.net.VpnTransportInfo makeCopy(long); method @NonNull public android.net.VpnTransportInfo makeCopy(long);
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.net.VpnTransportInfo> CREATOR;
field @Nullable public final String sessionId;
field public final int type;
} }
} }

2
packages/Connectivity/framework/api/system-current.txt
View File

@@ -238,7 +238,7 @@ package android.net {
method public final void sendQosSessionLost(int, int, int); method public final void sendQosSessionLost(int, int, int);
method public final void sendSocketKeepaliveEvent(int, int); method public final void sendSocketKeepaliveEvent(int, int);
method @Deprecated public void setLegacySubtype(int, @NonNull String); method @Deprecated public void setLegacySubtype(int, @NonNull String);
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 final void setUnderlyingNetworks(@Nullable java.util.List<android.net.Network>);
method public void unregister(); method public void unregister();
field public static final int VALIDATION_STATUS_NOT_VALID = 2; // 0x2 field public static final int VALIDATION_STATUS_NOT_VALID = 2; // 0x2

4
packages/Connectivity/framework/src/android/net/ConnectivityManager.java
View File

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

8
packages/Connectivity/framework/src/android/net/NetworkAgent.java
View File

@@ -879,11 +879,11 @@ public abstract class NetworkAgent {
* This method may be called at any time while the network is connected. It has no effect if * 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. * 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( public void setTeardownDelayMillis(
@IntRange(from = 0, to = MAX_TEARDOWN_DELAY_MS) int teardownDelayMs) { @IntRange(from = 0, to = MAX_TEARDOWN_DELAY_MS) int teardownDelayMillis) {
queueOrSendMessage(reg -> reg.sendTeardownDelayMs(teardownDelayMs)); queueOrSendMessage(reg -> reg.sendTeardownDelayMs(teardownDelayMillis));
} }
/** /**

37
packages/Connectivity/framework/src/android/net/VpnTransportInfo.java
View File

@@ -40,10 +40,10 @@ import java.util.Objects;
@SystemApi(client = MODULE_LIBRARIES) @SystemApi(client = MODULE_LIBRARIES)
public final class VpnTransportInfo implements TransportInfo, Parcelable { public final class VpnTransportInfo implements TransportInfo, Parcelable {
/** Type of this VPN. */ /** Type of this VPN. */
public final int type; private final int mType;
@Nullable @Nullable
public final String sessionId; private final String mSessionId;
@Override @Override
public @RedactionType long getApplicableRedactions() { public @RedactionType long getApplicableRedactions() {
@@ -55,13 +55,28 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable {
*/ */
@NonNull @NonNull
public VpnTransportInfo makeCopy(@RedactionType long redactions) { public VpnTransportInfo makeCopy(@RedactionType long redactions) {
return new VpnTransportInfo(type, return new VpnTransportInfo(mType,
((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : sessionId); ((redactions & REDACT_FOR_NETWORK_SETTINGS) != 0) ? null : mSessionId);
} }
public VpnTransportInfo(int type, @Nullable String sessionId) { public VpnTransportInfo(int type, @Nullable String sessionId) {
this.type = type; this.mType = type;
this.sessionId = sessionId; this.mSessionId = sessionId;
}
/**
* Returns the session Id of this VpnTransportInfo.
*/
@Nullable
public String getSessionId() {
return mSessionId;
}
/**
* Returns the type of this VPN.
*/
public int getType() {
return mType;
} }
@Override @Override
@@ -69,17 +84,17 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable {
if (!(o instanceof VpnTransportInfo)) return false; if (!(o instanceof VpnTransportInfo)) return false;
VpnTransportInfo that = (VpnTransportInfo) o; VpnTransportInfo that = (VpnTransportInfo) o;
return (this.type == that.type) && TextUtils.equals(this.sessionId, that.sessionId); return (this.mType == that.mType) && TextUtils.equals(this.mSessionId, that.mSessionId);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(type, sessionId); return Objects.hash(mType, mSessionId);
} }
@Override @Override
public String toString() { public String toString() {
return String.format("VpnTransportInfo{type=%d, sessionId=%s}", type, sessionId); return String.format("VpnTransportInfo{type=%d, sessionId=%s}", mType, mSessionId);
} }
@Override @Override
@@ -89,8 +104,8 @@ public final class VpnTransportInfo implements TransportInfo, Parcelable {
@Override @Override
public void writeToParcel(@NonNull Parcel dest, int flags) { public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeInt(type); dest.writeInt(mType);
dest.writeString(sessionId); dest.writeString(mSessionId);
} }
public static final @NonNull Creator<VpnTransportInfo> CREATOR = public static final @NonNull Creator<VpnTransportInfo> CREATOR =

2
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -8664,7 +8664,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (vpn == null) return VpnManager.TYPE_VPN_NONE; if (vpn == null) return VpnManager.TYPE_VPN_NONE;
final TransportInfo ti = vpn.networkCapabilities.getTransportInfo(); final TransportInfo ti = vpn.networkCapabilities.getTransportInfo();
if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE; if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE;
return ((VpnTransportInfo) ti).type; return ((VpnTransportInfo) ti).getType();
} }
/** /**

2
tests/net/java/android/net/ConnectivityManagerTest.java
View File

@@ -379,7 +379,7 @@ public class ConnectivityManagerTest {
eq(testPkgName), eq(testAttributionTag)); eq(testPkgName), eq(testAttributionTag));
reset(mService); reset(mService);
manager.registerDefaultNetworkCallbackAsUid(42, callback, handler); manager.registerDefaultNetworkCallbackForUid(42, callback, handler);
verify(mService).requestNetwork(eq(42), eq(null), verify(mService).requestNetwork(eq(42), eq(null),
eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE), anyInt(), eq(TRACK_DEFAULT.ordinal()), any(), anyInt(), any(), eq(TYPE_NONE), anyInt(),
eq(testPkgName), eq(testAttributionTag)); eq(testPkgName), eq(testAttributionTag));

2
tests/net/java/android/net/VpnTransportInfoTest.java
View File

@@ -63,6 +63,6 @@ public class VpnTransportInfoTest {
assertEquals(v31, v32); assertEquals(v31, v32);
assertEquals(v11.hashCode(), v13.hashCode()); assertEquals(v11.hashCode(), v13.hashCode());
assertEquals(REDACT_FOR_NETWORK_SETTINGS, v32.getApplicableRedactions()); assertEquals(REDACT_FOR_NETWORK_SETTINGS, v32.getApplicableRedactions());
assertEquals(session1, v15.makeCopy(REDACT_NONE).sessionId); assertEquals(session1, v15.makeCopy(REDACT_NONE).getSessionId());
} }
} }

22
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1400,7 +1400,7 @@ public class ConnectivityServiceTest {
final TransportInfo ti = nc.getTransportInfo(); final TransportInfo ti = nc.getTransportInfo();
assertTrue("VPN TransportInfo is not a VpnTransportInfo: " + ti, assertTrue("VPN TransportInfo is not a VpnTransportInfo: " + ti,
ti instanceof VpnTransportInfo); ti instanceof VpnTransportInfo);
assertEquals(type, ((VpnTransportInfo) ti).type); assertEquals(type, ((VpnTransportInfo) ti).getType());
} }
@@ -2928,7 +2928,7 @@ public class ConnectivityServiceTest {
callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mWiFiNetworkAgent);
// Set teardown delay and make sure CS has processed it. // Set teardown delay and make sure CS has processed it.
mWiFiNetworkAgent.getNetworkAgent().setTeardownDelayMs(300); mWiFiNetworkAgent.getNetworkAgent().setTeardownDelayMillis(300);
waitForIdle(); waitForIdle();
// Post the duringTeardown lambda to the handler so it fires while teardown is in progress. // Post the duringTeardown lambda to the handler so it fires while teardown is in progress.
@@ -4216,7 +4216,7 @@ public class ConnectivityServiceTest {
() -> mCm.registerSystemDefaultNetworkCallback(callback, handler)); () -> mCm.registerSystemDefaultNetworkCallback(callback, handler));
callback.assertNoCallback(); callback.assertNoCallback();
assertThrows(SecurityException.class, assertThrows(SecurityException.class,
() -> mCm.registerDefaultNetworkCallbackAsUid(APP1_UID, callback, handler)); () -> mCm.registerDefaultNetworkCallbackForUid(APP1_UID, callback, handler));
callback.assertNoCallback(); callback.assertNoCallback();
mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED); mServiceContext.setPermission(NETWORK_SETTINGS, PERMISSION_GRANTED);
@@ -4224,7 +4224,7 @@ public class ConnectivityServiceTest {
callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);
mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(callback);
mCm.registerDefaultNetworkCallbackAsUid(APP1_UID, callback, handler); mCm.registerDefaultNetworkCallbackForUid(APP1_UID, callback, handler);
callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent); callback.expectAvailableCallbacksUnvalidated(mCellNetworkAgent);
mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(callback);
} }
@@ -5600,7 +5600,7 @@ public class ConnectivityServiceTest {
for (int i = 0; i < SYSTEM_ONLY_MAX_REQUESTS - 1; i++) { for (int i = 0; i < SYSTEM_ONLY_MAX_REQUESTS - 1; i++) {
NetworkCallback cb = new NetworkCallback(); NetworkCallback cb = new NetworkCallback();
if (i % 2 == 0) { if (i % 2 == 0) {
mCm.registerDefaultNetworkCallbackAsUid(1000000 + i, cb, handler); mCm.registerDefaultNetworkCallbackForUid(1000000 + i, cb, handler);
} else { } else {
mCm.registerNetworkCallback(networkRequest, cb); mCm.registerNetworkCallback(networkRequest, cb);
} }
@@ -5609,7 +5609,7 @@ public class ConnectivityServiceTest {
waitForIdle(); waitForIdle();
assertThrows(TooManyRequestsException.class, () -> assertThrows(TooManyRequestsException.class, () ->
mCm.registerDefaultNetworkCallbackAsUid(1001042, new NetworkCallback(), mCm.registerDefaultNetworkCallbackForUid(1001042, new NetworkCallback(),
handler)); handler));
assertThrows(TooManyRequestsException.class, () -> assertThrows(TooManyRequestsException.class, () ->
mCm.registerNetworkCallback(networkRequest, new NetworkCallback())); mCm.registerNetworkCallback(networkRequest, new NetworkCallback()));
@@ -5662,7 +5662,7 @@ public class ConnectivityServiceTest {
withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () -> { withPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, () -> {
for (int i = 0; i < MAX_REQUESTS; i++) { for (int i = 0; i < MAX_REQUESTS; i++) {
NetworkCallback networkCallback = new NetworkCallback(); NetworkCallback networkCallback = new NetworkCallback();
mCm.registerDefaultNetworkCallbackAsUid(1000000 + i, networkCallback, mCm.registerDefaultNetworkCallbackForUid(1000000 + i, networkCallback,
new Handler(ConnectivityThread.getInstanceLooper())); new Handler(ConnectivityThread.getInstanceLooper()));
mCm.unregisterNetworkCallback(networkCallback); mCm.unregisterNetworkCallback(networkCallback);
} }
@@ -7747,7 +7747,7 @@ public class ConnectivityServiceTest {
registerDefaultNetworkCallbackAsUid(vpnUidDefaultCallback, VPN_UID); registerDefaultNetworkCallbackAsUid(vpnUidDefaultCallback, VPN_UID);
final TestNetworkCallback vpnDefaultCallbackAsUid = new TestNetworkCallback(); final TestNetworkCallback vpnDefaultCallbackAsUid = new TestNetworkCallback();
mCm.registerDefaultNetworkCallbackAsUid(VPN_UID, vpnDefaultCallbackAsUid, mCm.registerDefaultNetworkCallbackForUid(VPN_UID, vpnDefaultCallbackAsUid,
new Handler(ConnectivityThread.getInstanceLooper())); new Handler(ConnectivityThread.getInstanceLooper()));
final int uid = Process.myUid(); final int uid = Process.myUid();
@@ -10835,7 +10835,7 @@ public class ConnectivityServiceTest {
final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback(); final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback();
withPermission(NETWORK_SETTINGS, () -> withPermission(NETWORK_SETTINGS, () ->
mCm.registerDefaultNetworkCallbackAsUid(TEST_PACKAGE_UID, otherUidDefaultCallback, mCm.registerDefaultNetworkCallbackForUid(TEST_PACKAGE_UID, otherUidDefaultCallback,
new Handler(ConnectivityThread.getInstanceLooper()))); new Handler(ConnectivityThread.getInstanceLooper())));
// Setup the test process to use networkPref for their default network. // Setup the test process to use networkPref for their default network.
@@ -10883,7 +10883,7 @@ public class ConnectivityServiceTest {
final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback(); final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback();
withPermission(NETWORK_SETTINGS, () -> withPermission(NETWORK_SETTINGS, () ->
mCm.registerDefaultNetworkCallbackAsUid(TEST_PACKAGE_UID, otherUidDefaultCallback, mCm.registerDefaultNetworkCallbackForUid(TEST_PACKAGE_UID, otherUidDefaultCallback,
new Handler(ConnectivityThread.getInstanceLooper()))); new Handler(ConnectivityThread.getInstanceLooper())));
// Bring up ethernet with OEM_PAID. This will satisfy NET_CAPABILITY_OEM_PAID. // Bring up ethernet with OEM_PAID. This will satisfy NET_CAPABILITY_OEM_PAID.
@@ -10925,7 +10925,7 @@ public class ConnectivityServiceTest {
final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback(); final TestNetworkCallback otherUidDefaultCallback = new TestNetworkCallback();
withPermission(NETWORK_SETTINGS, () -> withPermission(NETWORK_SETTINGS, () ->
mCm.registerDefaultNetworkCallbackAsUid(TEST_PACKAGE_UID, otherUidDefaultCallback, mCm.registerDefaultNetworkCallbackForUid(TEST_PACKAGE_UID, otherUidDefaultCallback,
new Handler(ConnectivityThread.getInstanceLooper()))); new Handler(ConnectivityThread.getInstanceLooper())));
// Setup a process different than the test process to use the default network. This means // Setup a process different than the test process to use the default network. This means

2
tests/net/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1023,7 +1023,7 @@ public class VpnTest {
assertNotNull(nc); assertNotNull(nc);
VpnTransportInfo ti = (VpnTransportInfo) nc.getTransportInfo(); VpnTransportInfo ti = (VpnTransportInfo) nc.getTransportInfo();
assertNotNull(ti); assertNotNull(ti);
assertEquals(type, ti.type); assertEquals(type, ti.getType());
} }
public void startRacoon(final String serverAddr, final String expectedAddr) public void startRacoon(final String serverAddr, final String expectedAddr)