summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorsqian <shuoq@google.com>2020-03-18 18:26:07 +0000
committerShuo Qian <shuoq@google.com>2020-03-18 18:28:21 +0000
commita64f35259693650a582807f9e343e35be9e933cd (patch)
treeaa56fd28fe97aede29841f060d2a4088a6c9da1b /core/java
parent5b5bd31eb39480c419446b012b32d02b2f88bc7c (diff)
API Council Feedbacks
1) Add Annotation for getCarrirPrivilegeStatus 2) Remove NullProinterException throwing in isDataConnectionAllowed 3) Add SdkConstant for ACTION_UPDATE_EMRGENCY_NUMBER_DB Test: Treehugger Bug: 148218347 Bug: 151455822 Change-Id: I4943491abf70641f9379862a67941295a4cf67f9 Merged-In: I4943491abf70641f9379862a67941295a4cf67f9 (cherry picked from commit 43c2f470edab05a4cea2473be9063fdd9b6b3eae)
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/ConfigUpdate.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/os/ConfigUpdate.java b/core/java/android/os/ConfigUpdate.java
index 590fbb36a0e8..a28f5fbaba0b 100644
--- a/core/java/android/os/ConfigUpdate.java
+++ b/core/java/android/os/ConfigUpdate.java
@@ -17,6 +17,8 @@
package android.os;
import android.annotation.RequiresPermission;
+import android.annotation.SdkConstant;
+import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.SystemApi;
/**
@@ -125,6 +127,7 @@ public final class ConfigUpdate {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.UPDATE_CONFIG)
+ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_UPDATE_EMERGENCY_NUMBER_DB =
"android.os.action.UPDATE_EMERGENCY_NUMBER_DB";