diff options
| author | Grace Jia <xiaotonj@google.com> | 2020-03-19 23:27:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-19 23:27:03 +0000 |
| commit | 886efd654fa320ee19a104568e1c313fb8af8f10 (patch) | |
| tree | c3cfd8da23437dd2dc3c425cda921711f4caf580 /core/java/android | |
| parent | f75c281d9cd49b0fc081d278cd6404952e004aab (diff) | |
| parent | 906680a32cc0db7d9bde08fbcd1c7fc97fb22641 (diff) | |
Merge "Revert add isProfileForeground SystemApi in ActivityManager." into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index b3a0be1bec1e..b00f5420fd3c 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -4656,7 +4656,6 @@ public class ActivityManager { * @return Returns the boolean result. * @hide */ - @SystemApi @RequiresPermission(anyOf = { android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS |