| commit | 58606c506bb0b465b0e6c7f647c6f99b40b07a55 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Wed Dec 02 09:23:27 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Dec 02 09:23:27 2020 +0000 |
| tree | 06220db374e1497c6586b95a0b3138a31170a7ab | |
| parent | c54b7eda99e2e9c0d98d3b3306372d3e70642ecf [diff] | |
| parent | ee660cfd90c7a394713c1486be7e677786149fcf [diff] |
Merge "Add ConnectivityManager.TYPE_PROXY to SystemApi"
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; /**