Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update EmergencyNumber API docs to indicate they can throw." am: 76db055e20

Browse Source 
Change-Id: I1e34df3e17c249e26ac7d3cd813430e39bafaae9
This commit is contained in:
Automerger Merge Worker
2020-02-27 19:26:53 +00:00
parent 105fb4d00a 76db055e20
commit 4ddb5b7e1c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -11605,6 +11605,7 @@ public class TelephonyManager {
* subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value * subscription, the key is {@link SubscriptionManager#getDefaultSubscriptionId}) and the value
* as the list of {@link EmergencyNumber}; empty Map if this information is not available; * as the list of {@link EmergencyNumber}; empty Map if this information is not available;
* or throw a SecurityException if the caller does not have the permission. * or throw a SecurityException if the caller does not have the permission.
* @throws IllegalStateException if the Telephony process is not currently available.
*/ */
@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@NonNull @NonNull
@@ -11652,6 +11653,7 @@ public class TelephonyManager {
* @param number - the number to look up * @param number - the number to look up
* @return {@code true} if the given number is an emergency number based on current locale, * @return {@code true} if the given number is an emergency number based on current locale,
* SIM card(s), Android database, modem, network or defaults; {@code false} otherwise. * SIM card(s), Android database, modem, network or defaults; {@code false} otherwise.
* @throws IllegalStateException if the Telephony process is not currently available.
*/ */
public boolean isEmergencyNumber(@NonNull String number) { public boolean isEmergencyNumber(@NonNull String number) {
try { try {
@@ -11687,7 +11689,7 @@ public class TelephonyManager {
* the same digits of any current emergency number based on current locale, sim, modem and * the same digits of any current emergency number based on current locale, sim, modem and
* network; {@code false} if it is not; or throw an SecurityException if the caller does not * network; {@code false} if it is not; or throw an SecurityException if the caller does not
* have the required permission/privileges * have the required permission/privileges
* * @throws IllegalStateException if the Telephony process is not currently available.
* @hide * @hide
*/ */
@SystemApi @SystemApi