summaryrefslogtreecommitdiff
path: root/telecomm/java
diff options
context:
space:
mode:
author Meng Wang <mewan@google.com> 2022-01-07 00:31:23 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-01-07 00:31:23 +0000
commit886bf03a2d74aa14aebf8d193db5b68b1104507f (patch)
treeb0276d86d2056542678bd3977f5ffbfa5830b7f8 /telecomm/java
parentd35cd459d6d5046b54c0cf319485f766dc691802 (diff)
parent72afc76a69daf731f8bcc1a2bc33cd69292109db (diff)
Merge changes from topic "phonenumber"
* changes: Update javadocs based on API council feedback. Deprecate get/setLine1Number in favor of get/setPhoneNumber
Diffstat (limited to 'telecomm/java')
-rw-r--r--telecomm/java/android/telecom/TelecomManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index c9cf2ff28828..6122b080c500 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1692,7 +1692,11 @@ public class TelecomManager {
*
* @param accountHandle The handle for the account retrieve a number for.
* @return A string representation of the line 1 phone number.
+ * @deprecated use {@link SubscriptionManager#getPhoneNumber(int)} instead, which takes a
+ * Telephony Subscription ID that can be retrieved with the {@code accountHandle}
+ * from {@link TelephonyManager#getSubscriptionId(PhoneAccountHandle)}.
*/
+ @Deprecated
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges or default SMS app
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PHONE_STATE,