diff options
author | 2023-10-10 14:17:26 -0700 | |
---|---|---|
committer | 2023-10-10 14:19:24 -0700 | |
commit | 37155c880944fcba2759c101bcf65b12ce3c6f97 (patch) | |
tree | 03bb5f0281d96bdab8f9a0fc25c47b4b5b28f774 | |
parent | 36819def9691b1712dfa436676c6c5a4f8dd0cde (diff) |
Guarded relevant call id API changes with flagging.
This change guards CallDetails#getId and StreamingCall#EXTRA_CALL_ID with the newly added telecom flag FLAG_CALL_DETAILS_ID_CHANGES.
Bug: 301713560
Test: Updated CallDetailsTest#testCallId and CallStreamingTest
Change-Id: I3819fa9eda5995d7ef354e71d2b4c7d5a4423e66
-rw-r--r-- | core/api/current.txt | 2 | ||||
-rw-r--r-- | core/api/system-current.txt | 2 | ||||
-rw-r--r-- | telecomm/java/android/telecom/Call.java | 1 | ||||
-rw-r--r-- | telecomm/java/android/telecom/StreamingCall.java | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 5a1561ad80da..1af70a7b92f9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -41557,7 +41557,7 @@ package android.telecom { method public android.telecom.GatewayInfo getGatewayInfo(); method public android.net.Uri getHandle(); method public int getHandlePresentation(); - method @NonNull public String getId(); + method @FlaggedApi("com.android.server.telecom.flags.call_details_id_changes") @NonNull public String getId(); method public android.os.Bundle getIntentExtras(); method public final int getState(); method public android.telecom.StatusHints getStatusHints(); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a99eeb0c36d8..77efa8a69432 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -13228,7 +13228,7 @@ package android.telecom { method public void requestStreamingState(int); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator<android.telecom.StreamingCall> CREATOR; - field public static final String EXTRA_CALL_ID = "android.telecom.extra.CALL_ID"; + field @FlaggedApi("com.android.server.telecom.flags.call_details_id_changes") public static final String EXTRA_CALL_ID = "android.telecom.extra.CALL_ID"; field public static final int STATE_DISCONNECTED = 3; // 0x3 field public static final int STATE_HOLDING = 2; // 0x2 field public static final int STATE_STREAMING = 1; // 0x1 diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index a7675d694a24..def52a517913 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -942,6 +942,7 @@ public final class Call { * @return the Telecom identifier associated with this {@link Call} . This is not a stable * identifier and is not guaranteed to be unique across device reboots. */ + @FlaggedApi(Flags.FLAG_CALL_DETAILS_ID_CHANGES) public @NonNull String getId() { return mTelecomCallId; } /** {@hide} */ diff --git a/telecomm/java/android/telecom/StreamingCall.java b/telecomm/java/android/telecom/StreamingCall.java index 29f436d9f459..ad1b6f9e7665 100644 --- a/telecomm/java/android/telecom/StreamingCall.java +++ b/telecomm/java/android/telecom/StreamingCall.java @@ -16,6 +16,7 @@ package android.telecom; +import android.annotation.FlaggedApi; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.SystemApi; @@ -25,6 +26,8 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; +import com.android.server.telecom.flags.Flags; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -57,6 +60,7 @@ public final class StreamingCall implements Parcelable { /** * The ID associated with this call. This is the same value as {@link CallControl#getCallId()}. */ + @FlaggedApi(Flags.FLAG_CALL_DETAILS_ID_CHANGES) public static final String EXTRA_CALL_ID = "android.telecom.extra.CALL_ID"; /** |