diff options
| author | 2019-08-05 15:48:16 -0700 | |
|---|---|---|
| committer | 2019-08-05 15:48:16 -0700 | |
| commit | 4e3e68973f6ac5eca089b39d250b06f1aa434df4 (patch) | |
| tree | 5a8a458b64a8d409bd0eef80ce9f5fbb7319c696 | |
| parent | a88f18a5c70640d0b8ade03530f06ad6538ae09a (diff) | |
| parent | 46b82fd3cebfa4fc5f85f6c7d50fa18ae7cf8720 (diff) | |
Merge "Add a documentation in EmergencyNumber#getNumber" into qt-r1-dev
am: 46b82fd3ce
Change-Id: I7612bdffbea359966e480f9258b0a0478a0aac82
| -rw-r--r-- | telephony/java/android/telephony/emergency/EmergencyNumber.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/emergency/EmergencyNumber.java b/telephony/java/android/telephony/emergency/EmergencyNumber.java index 511adf6ad65b..19d07242132b 100644 --- a/telephony/java/android/telephony/emergency/EmergencyNumber.java +++ b/telephony/java/android/telephony/emergency/EmergencyNumber.java @@ -22,6 +22,7 @@ import android.hardware.radio.V1_4.EmergencyNumberSource; import android.hardware.radio.V1_4.EmergencyServiceCategory; import android.os.Parcel; import android.os.Parcelable; +import android.telephony.CarrierConfigManager; import android.telephony.PhoneNumberUtils; import android.telephony.Rlog; @@ -301,6 +302,9 @@ public final class EmergencyNumber implements Parcelable, Comparable<EmergencyNu * The character in the number string is only the dial pad * character('0'-'9', '*', '+', or '#'). For example: 911. * + * If the number starts with carrier prefix, the carrier prefix is configured in + * {@link CarrierConfigManager#KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY}. + * * @return the dialing number. */ public @NonNull String getNumber() { |