diff options
| author | Junda Liu <junda@google.com> | 2014-09-25 17:36:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 17:36:11 +0000 |
| commit | 698b3b29810525e3935c2bdba2faba945c3a1a7e (patch) | |
| tree | 554c271aab7f2874c3d757ebe0a593824e865d39 /telecomm | |
| parent | b6981859298eaa30981a60bc0cb0c2ae69082aac (diff) | |
| parent | bac6d61ab6d9ea16c305419dfe03e19cc5af9fd9 (diff) | |
| download | frameworks_base-698b3b29810525e3935c2bdba2faba945c3a1a7e.zip frameworks_base-698b3b29810525e3935c2bdba2faba945c3a1a7e.tar.gz frameworks_base-698b3b29810525e3935c2bdba2faba945c3a1a7e.tar.bz2 | |
Merge "Hide CarrierPrivilege APIs in TelMgr." into lmp-dev
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/telecomm/java/android/telecom/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java index ffe787a..1d6d8bc 100644 --- a/telecomm/java/android/telecom/PhoneAccount.java +++ b/telecomm/java/android/telecom/PhoneAccount.java @@ -286,9 +286,6 @@ public class PhoneAccount implements Parcelable { * The raw callback number used for this {@code PhoneAccount}, as distinct from * {@link #getAddress()}. For the majority of {@code PhoneAccount}s this should be registered * as {@code null}. It is used by the system for SIM-based {@code PhoneAccount} registration - * where {@link android.telephony.TelephonyManager#setLine1NumberForDisplay(String, String)} - * has been used to alter the callback number. - * <p> * * @return The subscription number, suitable for display to the user. */ |