diff options
| author | Grace Jia <xiaotonj@google.com> | 2020-03-10 14:29:07 -0700 |
|---|---|---|
| committer | Grace Jia <xiaotonj@google.com> | 2020-03-12 21:50:38 +0000 |
| commit | 906680a32cc0db7d9bde08fbcd1c7fc97fb22641 (patch) | |
| tree | 744b0692e3c49837119938447e43ed5b61227c91 | |
| parent | 700c955ffd60349ebc3709c39bb992b24c905d7c (diff) | |
Revert add isProfileForeground SystemApi in ActivityManager.
Bug: 146355892
Test: atest TeleServiceTests
Change-Id: I9dd1e1c40729fd884b4267691c4d262155365e2c
(cherry picked from commit e3e0614469727b83f34f0ef1979da22705e63951)
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index b7aa9da83c6a..20bc7d884dbb 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -344,7 +344,6 @@ package android.app { method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String); method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales(); method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int); - method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean isProfileForeground(@NonNull android.os.UserHandle); method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[], @NonNull String); method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String); method public void registerHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver); diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index dd4788e1146a..8b2f19d330cb 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4627,7 +4627,6 @@ public class ActivityManager { * @return Returns the boolean result. * @hide */ - @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS |