Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb539d44 authored by Grace Jia's avatar Grace Jia Committed by Automerger Merge Worker
Browse files

Merge "Revert add isProfileForeground SystemApi in ActivityManager." into rvc-dev am: 886efd65 

Change-Id: I57d79aa6fba10b5085d800c0828f3b9e2a8d947b
parents 669db87d 886efd65

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -342,7 +342,6 @@ package android.app { 
    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);

    method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();

    method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();

    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);

    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.FORCE_STOP_PACKAGES) public void killProcessesWhenImperceptible(@NonNull int[], @NonNull String);

    method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String);

    method @RequiresPermission(android.Manifest.permission.KILL_UID) public void killUid(int, String);

    method public void registerHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);

    method public void registerHomeVisibilityObserver(@NonNull android.app.HomeVisibilityObserver);

core/java/android/app/ActivityManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -4656,7 +4656,6 @@ public class ActivityManager { 
     * @return Returns the boolean result.

     * @return Returns the boolean result.

     * @hide

     * @hide

     */

     */

    @SystemApi

    @RequiresPermission(anyOf = {

    @RequiresPermission(anyOf = {

            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.MANAGE_USERS,

            android.Manifest.permission.CREATE_USERS

            android.Manifest.permission.CREATE_USERS