diff options
| author | Anton Hansson <hansson@google.com> | 2020-10-20 20:31:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-20 20:31:58 +0000 |
| commit | 24b4d166ddfbed6ff435f4a5d0ad3e3e5e167ad5 (patch) | |
| tree | be680a3b16f17ed06b542fd1120aef9b6d4d20e0 /telecomm/java/android/telecom/Conference.java | |
| parent | 8a60923e76f6fd36b35290b184b5bfeb3f1372dd (diff) | |
| parent | 14897c256d849c64d864dc8597dd4e7c82912788 (diff) | |
Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1466264
Change-Id: I859503688ea3254d5bd1b55e80cf1962286e948f
Diffstat (limited to 'telecomm/java/android/telecom/Conference.java')
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index 39c3ff9e8839..dc2fb948fdbe 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -24,7 +24,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.net.Uri; import android.os.Bundle; import android.os.SystemClock; @@ -137,7 +136,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi public final @NonNull String getTelecomCallId() { return mTelecomCallId; } @@ -609,7 +607,6 @@ public abstract class Conference extends Conferenceable { * @return The primary connection. * @hide */ - @TestApi @SystemApi public Connection getPrimaryConnection() { if (mUnmodifiableChildConnections == null || mUnmodifiableChildConnections.isEmpty()) { @@ -1012,7 +1009,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public void setConferenceState(boolean isConference) { mIsMultiparty = isConference; @@ -1067,7 +1063,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public final void setAddress(@NonNull Uri address, @TelecomManager.Presentation int presentation) { @@ -1155,7 +1150,6 @@ public abstract class Conference extends Conferenceable { * @hide */ @SystemApi - @TestApi public final void setCallerDisplayName(@NonNull String callerDisplayName, @TelecomManager.Presentation int presentation) { Log.d(this, "setCallerDisplayName %s", callerDisplayName); |