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

Commit b2442b90 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Remove Tethering @TestApi" am: bd175573 

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

Change-Id: I3dcf776384d6c53876acaeb344820a88c19027da
parents f88f3c9f bd175573

api/test-current.txt

+0 −94
Original line number Diff line number Diff line
@@ -2194,100 +2194,6 @@ package android.net { 
    method public void teardownTestNetwork(@NonNull android.net.Network);

  }



  public final class TetheredClient implements android.os.Parcelable {

    ctor public TetheredClient(@NonNull android.net.MacAddress, @NonNull java.util.Collection<android.net.TetheredClient.AddressInfo>, int);

    method public int describeContents();

    method @NonNull public java.util.List<android.net.TetheredClient.AddressInfo> getAddresses();

    method @NonNull public android.net.MacAddress getMacAddress();

    method public int getTetheringType();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.TetheredClient> CREATOR;

  }



  public static final class TetheredClient.AddressInfo implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public android.net.LinkAddress getAddress();

    method @Nullable public String getHostname();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.net.TetheredClient.AddressInfo> CREATOR;

  }



  public class TetheringManager {

    method @RequiresPermission(android.Manifest.permission.ACCESS_NETWORK_STATE) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.TetheringManager.TetheringEventCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public void requestLatestTetheringEntitlementResult(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.net.TetheringManager.OnTetheringEntitlementResultListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public void startTethering(@NonNull android.net.TetheringManager.TetheringRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.TetheringManager.StartTetheringCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public void stopAllTethering();

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public void stopTethering(int);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.ACCESS_NETWORK_STATE}) public void unregisterTetheringEventCallback(@NonNull android.net.TetheringManager.TetheringEventCallback);

    field public static final String ACTION_TETHER_STATE_CHANGED = "android.net.conn.TETHER_STATE_CHANGED";

    field public static final String EXTRA_ACTIVE_LOCAL_ONLY = "android.net.extra.ACTIVE_LOCAL_ONLY";

    field public static final String EXTRA_ACTIVE_TETHER = "tetherArray";

    field public static final String EXTRA_AVAILABLE_TETHER = "availableArray";

    field public static final String EXTRA_ERRORED_TETHER = "erroredArray";

    field public static final int TETHERING_BLUETOOTH = 2; // 0x2

    field public static final int TETHERING_ETHERNET = 5; // 0x5

    field public static final int TETHERING_INVALID = -1; // 0xffffffff

    field public static final int TETHERING_NCM = 4; // 0x4

    field public static final int TETHERING_USB = 1; // 0x1

    field public static final int TETHERING_WIFI = 0; // 0x0

    field public static final int TETHERING_WIFI_P2P = 3; // 0x3

    field public static final int TETHER_ERROR_DHCPSERVER_ERROR = 12; // 0xc

    field public static final int TETHER_ERROR_DISABLE_FORWARDING_ERROR = 9; // 0x9

    field public static final int TETHER_ERROR_ENABLE_FORWARDING_ERROR = 8; // 0x8

    field public static final int TETHER_ERROR_ENTITLEMENT_UNKNOWN = 13; // 0xd

    field public static final int TETHER_ERROR_IFACE_CFG_ERROR = 10; // 0xa

    field public static final int TETHER_ERROR_INTERNAL_ERROR = 5; // 0x5

    field public static final int TETHER_ERROR_NO_ACCESS_TETHERING_PERMISSION = 15; // 0xf

    field public static final int TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION = 14; // 0xe

    field public static final int TETHER_ERROR_NO_ERROR = 0; // 0x0

    field public static final int TETHER_ERROR_PROVISIONING_FAILED = 11; // 0xb

    field public static final int TETHER_ERROR_SERVICE_UNAVAIL = 2; // 0x2

    field public static final int TETHER_ERROR_TETHER_IFACE_ERROR = 6; // 0x6

    field public static final int TETHER_ERROR_UNAVAIL_IFACE = 4; // 0x4

    field public static final int TETHER_ERROR_UNKNOWN_IFACE = 1; // 0x1

    field public static final int TETHER_ERROR_UNKNOWN_TYPE = 16; // 0x10

    field public static final int TETHER_ERROR_UNSUPPORTED = 3; // 0x3

    field public static final int TETHER_ERROR_UNTETHER_IFACE_ERROR = 7; // 0x7

    field public static final int TETHER_HARDWARE_OFFLOAD_FAILED = 2; // 0x2

    field public static final int TETHER_HARDWARE_OFFLOAD_STARTED = 1; // 0x1

    field public static final int TETHER_HARDWARE_OFFLOAD_STOPPED = 0; // 0x0

  }



  public static interface TetheringManager.OnTetheringEntitlementResultListener {

    method public void onTetheringEntitlementResult(int);

  }



  public static interface TetheringManager.StartTetheringCallback {

    method public default void onTetheringFailed(int);

    method public default void onTetheringStarted();

  }



  public static interface TetheringManager.TetheringEventCallback {

    method public default void onClientsChanged(@NonNull java.util.Collection<android.net.TetheredClient>);

    method public default void onError(@NonNull String, int);

    method public default void onOffloadStatusChanged(int);

    method public default void onTetherableInterfacesChanged(@NonNull java.util.List<java.lang.String>);

    method public default void onTetheredInterfacesChanged(@NonNull java.util.List<java.lang.String>);

    method public default void onTetheringSupported(boolean);

    method public default void onUpstreamChanged(@Nullable android.net.Network);

  }



  public static class TetheringManager.TetheringRequest {

    method @Nullable public android.net.LinkAddress getClientStaticIpv4Address();

    method @Nullable public android.net.LinkAddress getLocalIpv4Address();

    method public boolean getShouldShowEntitlementUi();

    method public int getTetheringType();

    method public boolean isExemptFromEntitlementCheck();

  }



  public static class TetheringManager.TetheringRequest.Builder {

    ctor public TetheringManager.TetheringRequest.Builder(int);

    method @NonNull public android.net.TetheringManager.TetheringRequest build();

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setExemptFromEntitlementCheck(boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setShouldShowEntitlementUi(boolean);

    method @NonNull @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public android.net.TetheringManager.TetheringRequest.Builder setStaticIpv4Addresses(@NonNull android.net.LinkAddress, @NonNull android.net.LinkAddress);

  }



  public class TrafficStats {

    method public static long getLoopbackRxBytes();

    method public static long getLoopbackRxPackets();

packages/Tethering/common/TetheringLib/src/android/net/TetheredClient.java

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.net; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.os.Parcel;

import android.os.Parcelable;
@@ -34,7 +33,6 @@ import java.util.Objects; 
 * @hide

 */

@SystemApi

@TestApi

public final class TetheredClient implements Parcelable {

    @NonNull

    private final MacAddress mMacAddress;

packages/Tethering/common/TetheringLib/src/android/net/TetheringManager.java

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.content.Context;

import android.os.Bundle;

import android.os.ConditionVariable;
@@ -55,7 +54,6 @@ import java.util.function.Supplier; 
 * @hide

 */

@SystemApi

@TestApi

public class TetheringManager {

    private static final String TAG = TetheringManager.class.getSimpleName();

    private static final int DEFAULT_TIMEOUT_MS = 60_000;