LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance"

Browse Source
This commit is contained in:
Chiachang Wang
2020-07-28 10:51:53 +00:00
committed by Gerrit Code Review
parent c36f17d32e 3b9549f408
commit f702025bdf
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/ConnectivityManager.java
View File

@@ -608,7 +608,7 @@ public class ConnectivityManager {
public static final int TYPE_BLUETOOTH = 7; public static final int TYPE_BLUETOOTH = 7;
/** /**
* Dummy data connection. This should not be used on shipping devices. * Fake data connection. This should not be used on shipping devices.
* @deprecated This is not used any more. * @deprecated This is not used any more.
*/ */
@Deprecated @Deprecated
@@ -1084,9 +1084,9 @@ public class ConnectivityManager {
* to remove an existing always-on VPN configuration. * to remove an existing always-on VPN configuration.
* @param lockdownEnabled {@code true} to disallow networking when the VPN is not connected or * @param lockdownEnabled {@code true} to disallow networking when the VPN is not connected or
* {@code false} otherwise. * {@code false} otherwise.
* @param lockdownWhitelist The list of packages that are allowed to access network directly * @param lockdownAllowlist The list of packages that are allowed to access network directly
* when VPN is in lockdown mode but is not running. Non-existent packages are ignored so * when VPN is in lockdown mode but is not running. Non-existent packages are ignored so
* this method must be called when a package that should be whitelisted is installed or * this method must be called when a package that should be allowed is installed or
* uninstalled. * uninstalled.
* @return {@code true} if the package is set as always-on VPN controller; * @return {@code true} if the package is set as always-on VPN controller;
* {@code false} otherwise. * {@code false} otherwise.
@@ -1094,10 +1094,10 @@ public class ConnectivityManager {
*/ */
@RequiresPermission(android.Manifest.permission.CONTROL_ALWAYS_ON_VPN) @RequiresPermission(android.Manifest.permission.CONTROL_ALWAYS_ON_VPN)
public boolean setAlwaysOnVpnPackageForUser(int userId, @Nullable String vpnPackage, public boolean setAlwaysOnVpnPackageForUser(int userId, @Nullable String vpnPackage,
boolean lockdownEnabled, @Nullable List<String> lockdownWhitelist) { boolean lockdownEnabled, @Nullable List<String> lockdownAllowlist) {
try { try {
return mService.setAlwaysOnVpnPackage( return mService.setAlwaysOnVpnPackage(
userId, vpnPackage, lockdownEnabled, lockdownWhitelist); userId, vpnPackage, lockdownEnabled, lockdownAllowlist);
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

4
core/java/android/net/NetworkState.java
View File

@@ -28,7 +28,7 @@ import android.util.Slog;
* @hide * @hide
*/ */
public class NetworkState implements Parcelable { public class NetworkState implements Parcelable {
private static final boolean SANITY_CHECK_ROAMING = false; private static final boolean VALIDATE_ROAMING_STATE = false;
public static final NetworkState EMPTY = new NetworkState(null, null, null, null, null, null); public static final NetworkState EMPTY = new NetworkState(null, null, null, null, null, null);
@@ -52,7 +52,7 @@ public class NetworkState implements Parcelable {
// This object is an atomic view of a network, so the various components // This object is an atomic view of a network, so the various components
// should always agree on roaming state. // should always agree on roaming state.
if (SANITY_CHECK_ROAMING && networkInfo != null && networkCapabilities != null) { if (VALIDATE_ROAMING_STATE && networkInfo != null && networkCapabilities != null) {
if (networkInfo.isRoaming() == networkCapabilities if (networkInfo.isRoaming() == networkCapabilities
.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) { .hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)) {
Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo Slog.wtf("NetworkState", "Roaming state disagreement between " + networkInfo

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

@@ -4226,7 +4226,7 @@ public class ConnectivityServiceTest {
callback.expectError(SocketKeepalive.ERROR_INVALID_IP_ADDRESS); callback.expectError(SocketKeepalive.ERROR_INVALID_IP_ADDRESS);
} }
// Sanity check before testing started keepalive. // Basic check before testing started keepalive.
try (SocketKeepalive ka = mCm.createSocketKeepalive( try (SocketKeepalive ka = mCm.createSocketKeepalive(
myNet, testSocket, myIPv4, dstIPv4, executor, callback)) { myNet, testSocket, myIPv4, dstIPv4, executor, callback)) {
ka.start(validKaInterval); ka.start(validKaInterval);