From 4dc238b5e5b12dd36762f9a29397bbb99eda4591 Mon Sep 17 00:00:00 2001 From: paulhu Date: Mon, 13 Jan 2020 16:46:45 +0800 Subject: [PATCH] Expose ConnectivityManager#TYPE_NONE as SystemApi Support wifi mainline module usage. Bug: 135998869 Test: Build and make system-api-stubs-docs-update-current-api atest FrameworksNetTests Change-Id: Ia496aaeaf74fa44764640fd2b97c417509e040aa --- api/system-current.txt | 1 + core/java/android/net/ConnectivityManager.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/api/system-current.txt b/api/system-current.txt index 73bfd203ff378..3bce3a6bc49d9 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4285,6 +4285,7 @@ package android.net { field public static final int TETHER_ERROR_ENTITLEMENT_UNKONWN = 13; // 0xd field public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0 field public static final int TETHER_ERROR_PROVISION_FAILED = 11; // 0xb + field public static final int TYPE_NONE = -1; // 0xffffffff } public abstract static class ConnectivityManager.OnStartTetheringCallback { diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 4002e8d776241..26114bebd53d6 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -517,7 +517,7 @@ public class ConnectivityManager { * The absence of a connection type. * @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 130143562) + @SystemApi public static final int TYPE_NONE = -1; /**