summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author markchien <markchien@google.com> 2019-12-04 14:01:46 +0800
committer markchien <markchien@google.com> 2019-12-04 14:33:51 +0800
commit665a2cc1f0d9df6f73fbeaf9ce46a74afda71183 (patch)
tree86f7228775f174a255c5a4f16e2a797ee379188e
parente8401aff922b4935162893be9b9b9b714d95d81c (diff)
Expose netId to SystemApi
Tethering will be build as unblundled APP. It can't use @hide API anymore. Expose netId for tethering because it need to set proxy dns server with netId. Bug: 144758139 Test: build Change-Id: Ifefa791940874617bb479f5c23488d14be87f45e
-rw-r--r--api/system-current.txt1
-rw-r--r--core/java/android/net/Network.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 492354ae661a..70877093b849 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4175,6 +4175,7 @@ package android.net {
public class Network implements android.os.Parcelable {
ctor public Network(@NonNull android.net.Network);
method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
+ field public final int netId;
}
public final class NetworkCapabilities implements android.os.Parcelable {
diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java
index 3f56def6d7d5..f12ba1367d98 100644
--- a/core/java/android/net/Network.java
+++ b/core/java/android/net/Network.java
@@ -63,7 +63,7 @@ public class Network implements Parcelable {
/**
* @hide
*/
- @UnsupportedAppUsage
+ @SystemApi
public final int netId;
// Objects used to perform per-network operations such as getSocketFactory