| commit | 8637acec9dab1ad66bb177f57802d672b17c8ceb | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Feb 15 12:34:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 15 12:34:36 2021 +0000 |
| tree | f349f9afcff71efb5999e90dae714262be0875fc | |
| parent | 96f21fd65f265747ba20c1efd521e9541ae2db2f [diff] | |
| parent | 69f3b6bd3cf3e21a9ff698b908f4da919ed4039e [diff] |
Merge "Rename getVpnLockdownWhitelist to -Allowlist" am: deae737952 am: 69f3b6bd3c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580383 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a6a2442a6dffe85c6d9f4783438b4a07865fd05
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 27386bc..4213f8a 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -1117,7 +1117,7 @@ * @hide */ @Deprecated - public List<String> getVpnLockdownWhitelist(int userId) { + public List<String> getVpnLockdownAllowlist(int userId) { return getVpnManager().getVpnLockdownAllowlist(userId); }