Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c73

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc3c9f8e1ac8064e2e006587b4d4870d74cee2d
This commit is contained in:
Junyu Lai
2021-02-03 03:03:01 +00:00
committed by Automerger Merge Worker
parent 87e9535aa3 75b50a5c73
commit ce1b075b2b
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/api/module-lib-current.txt
View File

@@ -61,6 +61,16 @@ package android.net {
method public void teardownTestNetwork(@NonNull android.net.Network); method public void teardownTestNetwork(@NonNull android.net.Network);
} }
public final class UnderlyingNetworkInfo implements android.os.Parcelable {
ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);
method public int describeContents();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.net.UnderlyingNetworkInfo> CREATOR;
field @NonNull public final String iface;
field public final int ownerUid;
field @NonNull public final java.util.List<java.lang.String> underlyingIfaces;
}
} }
package android.os { package android.os {

7
core/java/android/net/UnderlyingNetworkInfo.java
View File

@@ -16,11 +16,15 @@
package android.net; package android.net;
import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@@ -30,6 +34,7 @@ import java.util.Objects;
* *
* @hide * @hide
*/ */
@SystemApi(client = MODULE_LIBRARIES)
public final class UnderlyingNetworkInfo implements Parcelable { public final class UnderlyingNetworkInfo implements Parcelable {
/** The owner of this network. */ /** The owner of this network. */
public final int ownerUid; public final int ownerUid;
@@ -46,7 +51,7 @@ public final class UnderlyingNetworkInfo implements Parcelable {
Objects.requireNonNull(underlyingIfaces); Objects.requireNonNull(underlyingIfaces);
this.ownerUid = ownerUid; this.ownerUid = ownerUid;
this.iface = iface; this.iface = iface;
this.underlyingIfaces = underlyingIfaces; this.underlyingIfaces = Collections.unmodifiableList(new ArrayList<>(underlyingIfaces));
} }
private UnderlyingNetworkInfo(@NonNull Parcel in) { private UnderlyingNetworkInfo(@NonNull Parcel in) {