diff options
| author | 2020-03-19 19:21:29 +0000 | |
|---|---|---|
| committer | 2020-03-19 19:21:29 +0000 | |
| commit | bcb1f3dbb00b5fab096deeaa5c9f6a8f09a0404f (patch) | |
| tree | b427c75b321e9bad15fd3cdbfa4be834ca9d4f77 | |
| parent | f4885bf28f60099a91a75a1580ce21cf88d3c972 (diff) | |
| parent | 5bc1744d570e4845eddc9e81bf12ff5327d944ba (diff) | |
Merge "[Telephony Mainline] Hide notifyUserActivity API in R" into rvc-dev
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b66c704e24c9..a0c0126a755a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -11502,7 +11502,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 11568f16bb6a..c2961e7f13fb 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 d6f5bb2577ab..4ae9320e6cd2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -13107,7 +13107,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 { |