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

Commit ce472971 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Expose TEST_TAP_PREFIX as system API" am: f614cdce am: bb6c348b am: 35447ff7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3a9078ce1e823c4762e193cbc27b7ab7d8932a8
parents e5cb0d2d 35447ff7

core/api/module-lib-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ package android.net { 
    method @NonNull public android.net.TestNetworkInterface createTunInterface(@NonNull java.util.Collection<android.net.LinkAddress>);

    method public void setupTestNetwork(@NonNull String, @NonNull android.os.IBinder);

    method public void teardownTestNetwork(@NonNull android.net.Network);

    field public static final String TEST_TAP_PREFIX = "testtap";

  }



  public final class UnderlyingNetworkInfo implements android.os.Parcelable {

packages/Connectivity/framework/src/android/net/TestNetworkManager.java

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ public class TestNetworkManager { 


    /**

     * Prefix for tap interfaces created by this class.

     * @hide

     */

    public static final String TEST_TAP_PREFIX = "testtap";