commit 005a5a2d35086c7c56a12c9c5e07bc44774b719b
author Meng Wang <mewan@google.com> Wed Dec 11 17:28:59 2019 -0800
committer Meng Wang <mewan@google.com> Thu Dec 12 04:50:41 2019 +0000
tree 1217a4dedf3b3cc8c4a8977018eacff4e9e1eb70
parent 6fce89f8b65755657d46ed6f938eeb8ec7b79a90

Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi

It's used by DefaultPermissionGrantPolicy.

Bug: 146091614
Test: make
Change-Id: I907736c7d6745660279a505761e27dfbbd1ddc97

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index ebfd55e..f7f6544 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8933,6 +8933,7 @@
     method public void updateServiceLocation();
     method @RequiresPermission(android.Manifest.permission.READ_ACTIVE_EMERGENCY_SESSION) public void updateTestOtaEmergencyNumberDbFilePath(@NonNull String);
     field @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public static final String ACTION_ANOMALY_REPORTED = "android.telephony.action.ANOMALY_REPORTED";
+    field public static final String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";
     field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
     field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
     field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 4fb26fd..ecaf21cd 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -592,6 +592,7 @@
      *
      * @hide
      */
+    @SystemApi
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_EMERGENCY_ASSISTANCE =
             "android.telephony.action.EMERGENCY_ASSISTANCE";