Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea7f3662 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

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

Merge "[FUI20] Expose UnderlyingNetworkInfo as system Api" am: 75b50a5c am: ce1b075b am: 93af3281

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia294d4ec349db10f5486b27f733d4f6d223079bf
parents 3b35ad2f 93af3281

core/api/module-lib-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -208,6 +208,16 @@ package android.net { 
    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 {

core/java/android/net/UnderlyingNetworkInfo.java

+6 −1
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ 


package android.net;



import static android.annotation.SystemApi.Client.MODULE_LIBRARIES;



import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;
@@ -30,6 +34,7 @@ import java.util.Objects; 
 *

 * @hide

 */

@SystemApi(client = MODULE_LIBRARIES)

public final class UnderlyingNetworkInfo implements Parcelable {

    /** The owner of this network. */

    public final int ownerUid;
@@ -46,7 +51,7 @@ public final class UnderlyingNetworkInfo implements Parcelable { 
        Objects.requireNonNull(underlyingIfaces);

        this.ownerUid = ownerUid;

        this.iface = iface;

        this.underlyingIfaces = underlyingIfaces;

        this.underlyingIfaces = Collections.unmodifiableList(new ArrayList<>(underlyingIfaces));

    }



    private UnderlyingNetworkInfo(@NonNull Parcel in) {