commit 913b21d0781a507fbbef8bafa40e6f5281da3964
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 21:29:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 21:29:05 2020 +0000
tree cf157e9309f93978bd86e01f574df62ecbfaebd4
parent f8455c70c3454665cf41dae32b8fe04fc343c2ed
parent f27ce8cd4fe51b9b287abb991cf677f346427b8d

Merge "Merge "Hide API" into rvc-dev am: 58979d9557 am: b86e26043c am: 322d0f8d40" into rvc-qpr-dev-plus-aosp am: f27ce8cd4f

Change-Id: Ia5a38f8b01c340037b0598fb20638d2b64fd2dc7

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 84664ff..85ac1e9 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11802,7 +11802,6 @@
     method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setAllowedCarriers(int, java.util.List<android.service.carrier.CarrierIdentifier>);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAllowedNetworkTypes(long);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setAlwaysAllowMmsData(boolean);
-    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAlwaysReportSignalStrength(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallForwarding(@NonNull android.telephony.CallForwardingInfo);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setCallWaitingStatus(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCarrierDataEnabled(boolean);

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 3fe5fdd..37819f8 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -11157,7 +11157,6 @@
      * @param isEnabled {@code true} for enabling; {@code false} for disabling.
      * @hide
      */
-    @SystemApi
     @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
     public void setAlwaysReportSignalStrength(boolean isEnabled) {
         try {