| commit | 18b4fc1e67173e8ac2f93da10679212f9ed0007d | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Dec 02 10:05:42 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 02 10:05:42 2020 +0000 |
| tree | 06220db374e1497c6586b95a0b3138a31170a7ab | |
| parent | 4f3407d2976409fa19b9c2aa067a9eead41f2ae2 [diff] | |
| parent | 58606c506bb0b465b0e6c7f647c6f99b40b07a55 [diff] |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi" am: 58606c506b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1512885 Change-Id: I0eb069c5ed0daca29f1bc4d3fd62f83879985b1c
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index c28a901..cf5d4e5 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java
@@ -684,7 +684,7 @@ * {@hide} */ @Deprecated - @UnsupportedAppUsage + @SystemApi public static final int TYPE_PROXY = 16; /**