summaryrefslogtreecommitdiff
path: root/telephony
diff options
context:
space:
mode:
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 531fe1adcadb..f8797e3904a5 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -15490,11 +15490,15 @@ public class TelephonyManager {
* or throw a SecurityException if the caller does not have the permission.
*
* @throws UnsupportedOperationException If the device does not have
- * {@link PackageManager#FEATURE_TELEPHONY_CALLING}.
+ * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or
+ * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}.
*/
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@NonNull
- @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING)
+ @RequiresFeature(anyOf = {
+ PackageManager.FEATURE_TELEPHONY_CALLING,
+ PackageManager.FEATURE_TELEPHONY_MESSAGING
+ })
public Map<Integer, List<EmergencyNumber>> getEmergencyNumberList() {
Map<Integer, List<EmergencyNumber>> emergencyNumberList = new HashMap<>();
try {
@@ -15548,11 +15552,15 @@ public class TelephonyManager {
* or throw a SecurityException if the caller does not have the permission.
* @throws IllegalStateException if the Telephony process is not currently available.
* @throws UnsupportedOperationException If the device does not have
- * {@link PackageManager#FEATURE_TELEPHONY_CALLING}.
+ * {@link PackageManager#FEATURE_TELEPHONY_CALLING} or
+ * {@link PackageManager#FEATURE_TELEPHONY_MESSAGING}.
*/
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@NonNull
- @RequiresFeature(PackageManager.FEATURE_TELEPHONY_CALLING)
+ @RequiresFeature(anyOf = {
+ PackageManager.FEATURE_TELEPHONY_CALLING,
+ PackageManager.FEATURE_TELEPHONY_MESSAGING
+ })
public Map<Integer, List<EmergencyNumber>> getEmergencyNumberList(
@EmergencyServiceCategories int categories) {
Map<Integer, List<EmergencyNumber>> emergencyNumberListForCategories = new HashMap<>();