commit eccc2770666e4da80a9e0e94f94984d7053c3ad5
author Anton Hansson <hansson@google.com> Thu Oct 15 10:05:16 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 15 10:05:16 2020 +0000
tree ea3b9426db25a3863b600f3d8a9b6928f56300ce
parent 188bbe712d62a9381db2ae7b908a7a9f2e468bdb
parent f8f8967d0e980a90616767a29832bacabdb151a5

Merge "Remove Tethering @TestApi" into mainline-prod

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

diff --git a/Tethering/common/TetheringLib/src/android/net/TetheredClient.java b/Tethering/common/TetheringLib/src/android/net/TetheredClient.java
index 645b000..0b223f4 100644
--- a/Tethering/common/TetheringLib/src/android/net/TetheredClient.java
+++ b/Tethering/common/TetheringLib/src/android/net/TetheredClient.java
@@ -19,7 +19,6 @@
 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 @@
  * @hide
  */
 @SystemApi
-@TestApi
 public final class TetheredClient implements Parcelable {
     @NonNull
     private final MacAddress mMacAddress;

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

diff --git a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
index d9d8013..3267195 100644
--- a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
+++ b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java
@@ -23,7 +23,6 @@
 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 @@
  * @hide
  */
 @SystemApi
-@TestApi
 public class TetheringManager {
     private static final String TAG = TetheringManager.class.getSimpleName();
     private static final int DEFAULT_TIMEOUT_MS = 60_000;