commit 56dbe3ee4bea8fce11a2698a44778e264e9ec2db
author Adrian Roos <roosa@google.com> Tue Jun 02 20:50:34 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 20:50:55 2015 +0000
tree 844fde7a4abd3762d40d977c426168ab3f445c25
parent ffa8f101ccdaae5aff14f7368e8910920157c615
parent 46fa08d66483bf041fdc0a4eace63f9addf8e629

Merge "Hide and disable emergency assist API" into mnc-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 71e601f..8563b92 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -31188,7 +31188,6 @@
     method public boolean setOperatorBrandOverride(java.lang.String);
     method public boolean setPreferredNetworkTypeToGlobal();
     method public boolean setVoiceMailNumber(java.lang.String, java.lang.String);
-    field public static final java.lang.String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";
     field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
     field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
     field public static final int CALL_STATE_IDLE = 0; // 0x0

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 16a8f34..45f97c6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33442,7 +33442,6 @@
     method public int[] supplyPukReportResult(java.lang.String, java.lang.String);
     method public void toggleRadioOnOff();
     method public void updateServiceLocation();
-    field public static final java.lang.String ACTION_EMERGENCY_ASSISTANCE = "android.telephony.action.EMERGENCY_ASSISTANCE";
     field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
     field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
     field public static final int CALL_STATE_IDLE = 0; // 0x0

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index f29a6ed..f51cb65 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -264,12 +264,19 @@
     /**
      * The emergency dialer may choose to present activities with intent filters for this
      * action as emergency assistance buttons that launch the activity when clicked.
+     *
+     * @hide
      */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_EMERGENCY_ASSISTANCE =
             "android.telephony.action.EMERGENCY_ASSISTANCE";
 
     /**
+     * @hide
+     */
+    public static final boolean EMERGENCY_ASSISTANCE_ENABLED = false;
+
+    /**
      * The lookup key used with the {@link #ACTION_PHONE_STATE_CHANGED} broadcast
      * for a String containing the new call state.
      *