summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author sqian <shuoq@google.com> 2019-08-05 15:48:11 -0700
committer android-build-merger <android-build-merger@google.com> 2019-08-05 15:48:11 -0700
commit66ef0077f22100fa886b1a80a959a16fb54d35fe (patch)
tree17e1fc3a9af87b536b7e91714a3730e6eba0696c
parentad194292123c7c9b218a8daf8875e16c25810b23 (diff)
parent46b82fd3cebfa4fc5f85f6c7d50fa18ae7cf8720 (diff)
Merge "Add a documentation in EmergencyNumber#getNumber" into qt-r1-dev
am: 46b82fd3ce Change-Id: I09df0f18c165e2201732ccd126599b802c2fc508
-rw-r--r--telephony/java/android/telephony/emergency/EmergencyNumber.java4
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() {