From 5bc1744d570e4845eddc9e81bf12ff5327d944ba Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Tue, 17 Mar 2020 17:12:16 -0700 Subject: [PATCH] [Telephony Mainline] Hide notifyUserActivity API in R Bug: 151076594 Fix: 151076594 Test: Build Change-Id: I93fef90456c724d17559f8a2188ba85e26f7835c --- api/system-current.txt | 1 - telephony/api/system-current.txt | 1 - telephony/java/android/telephony/TelephonyManager.java | 1 - 3 files changed, 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index f4e2a936f603f..11c297149ae58 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11514,7 +11514,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String); method public boolean needsOtaServiceProvisioning(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled(); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyUserActivity(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean); method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); diff --git a/telephony/api/system-current.txt b/telephony/api/system-current.txt index a49d3d539a7a6..63bc422f4f875 100644 --- a/telephony/api/system-current.txt +++ b/telephony/api/system-current.txt @@ -825,7 +825,6 @@ package android.telephony { method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String); method public boolean needsOtaServiceProvisioning(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled(); - method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyUserActivity(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void reportDefaultNetworkStatus(boolean); method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.MODIFY_PHONE_STATE}) public void requestCellInfoUpdate(@NonNull android.os.WorkSource, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fbd69da84936c..b9679fd48fd81 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -13114,7 +13114,6 @@ public class TelephonyManager { * This should only be called from system Uid. * @hide */ - @SystemApi @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyUserActivity() { try {