| commit | 67f88535d1636f5183b0526268ec420c01d8f8be | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Thu Oct 15 11:11:02 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 15 11:11:02 2020 +0000 |
| tree | 1d36418b4e313a3ceccea68aeae736d0bbceab59 | |
| parent | eea93bf6ed999015e6a86ab5ce66951fe032e4a8 [diff] | |
| parent | 87b8363cb9e227a564ea60f110203fce843d4cc6 [diff] |
Merge "Remove Tethering @TestApi" am: bd175573a5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522 Change-Id: I3dcf776384d6c53876acaeb344820a88c19027da
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;
diff --git a/Tethering/common/TetheringLib/src/android/net/TetheringManager.java b/Tethering/common/TetheringLib/src/android/net/TetheringManager.java index 88e0b42..97fb497 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;