diff options
| author | Scott Lobdell <slobdell@google.com> | 2020-11-05 18:29:12 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2020-11-13 11:48:49 -0800 |
| commit | 3933f277a025be704e68ea593536e492831a7e05 (patch) | |
| tree | 084aa5e0858c449a63dd18cc57fb21ab054d363a /telecomm/java/android/telecom/PhoneAccount.java | |
| parent | 248a6ce2e2ee65f367b01c43edeecef5a6d57581 (diff) | |
| parent | 9c74513b2d828d5169e9942b58b2f93bb3e04aff (diff) | |
Merge SP1A.201105.002
Change-Id: Iec83a0c1f6f286a1e51abfc4356633ca9d8aea5f
Diffstat (limited to 'telecomm/java/android/telecom/PhoneAccount.java')
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index 866e17148a1a..5024ae27ee49 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -21,7 +21,6 @@ import static android.Manifest.permission.MODIFY_PHONE_STATE; import android.annotation.NonNull; import android.annotation.RequiresPermission; import android.annotation.SystemApi; -import android.annotation.TestApi; import android.content.Intent; import android.graphics.drawable.Icon; import android.net.Uri; @@ -635,7 +634,6 @@ public final class PhoneAccount implements Parcelable { * @hide */ @SystemApi - @TestApi @RequiresPermission(MODIFY_PHONE_STATE) public @NonNull Builder setGroupId(@NonNull String groupId) { if (groupId != null) { |