From 8f5733897abc2e375a14f2be7fa3cd3a481eba4d Mon Sep 17 00:00:00 2001
From: goneil <goneil@google.com>
Date: Thu, 9 Nov 2017 13:32:42 -0800
Subject: [PATCH] Make TelephonyManager#getEmergencyCallbackMode SystemApi

BUG: 67750821
Test: android.telephony.cts.TelephonyManagerTest#testTelephonyManager().
Basic test to ensure that the method does not throw any exception.

Change-Id: I00f0e62803810b2650eba7562a84774369e917c6
---
 api/system-current.txt                                 | 1 +
 telephony/java/android/telephony/TelephonyManager.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 16404e47ebec0..6a7376f380152 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4110,6 +4110,7 @@ package android.telephony {
     method public int getCurrentPhoneType(int);
     method public deprecated boolean getDataEnabled();
     method public deprecated boolean getDataEnabled(int);
+    method public boolean getEmergencyCallbackMode();
     method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();
     method public android.os.Bundle getVisualVoicemailSettings();
     method public boolean handlePinMmi(java.lang.String);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 81806e52f0d80..326f650a8f839 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -6866,6 +6866,8 @@ public class TelephonyManager {
      * @return true if phone is in emergency callback mode
      * @hide
      */
+    @SystemApi
+    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
     public boolean getEmergencyCallbackMode() {
         return getEmergencyCallbackMode(getSubId());
     }