Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide the stop button for the device admin app in the task manager" into tm-dev am: d62d63b26a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18567918

Change-Id: Ic14b1bf3b62b4146683c2ca323228c92fd053382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-05-24 19:02:15 +00:00
committed by Automerger Merge Worker
parent ed578c06b2 d62d63b26a
commit 86af120e9e
6 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apex/jobscheduler/framework/java/android/os/PowerExemptionManager.java
View File

@@ -379,6 +379,11 @@ public class PowerExemptionManager {
* @hide
*/
public static final int REASON_DISALLOW_APPS_CONTROL = 323;
/**
* Active device admin package.
* @hide
*/
public static final int REASON_ACTIVE_DEVICE_ADMIN = 324;
/** @hide The app requests out-out. */
public static final int REASON_OPT_OUT_REQUESTED = 1000;
@@ -459,6 +464,7 @@ public class PowerExemptionManager {
REASON_OPT_OUT_REQUESTED,
REASON_DPO_PROTECTED_APP,
REASON_DISALLOW_APPS_CONTROL,
REASON_ACTIVE_DEVICE_ADMIN,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ReasonCode {}
@@ -669,6 +675,8 @@ public class PowerExemptionManager {
return AppBackgroundRestrictionsInfo.REASON_DPO_PROTECTED_APP;
case REASON_DISALLOW_APPS_CONTROL:
return AppBackgroundRestrictionsInfo.REASON_DISALLOW_APPS_CONTROL;
case REASON_ACTIVE_DEVICE_ADMIN:
return AppBackgroundRestrictionsInfo.REASON_ACTIVE_DEVICE_ADMIN;
default:
return AppBackgroundRestrictionsInfo.REASON_DENIED;
}
@@ -818,6 +826,8 @@ public class PowerExemptionManager {
return "DPO_PROTECTED_APP";
case REASON_DISALLOW_APPS_CONTROL:
return "DISALLOW_APPS_CONTROL";
case REASON_ACTIVE_DEVICE_ADMIN:
return "ACTIVE_DEVICE_ADMIN";
case REASON_OPT_OUT_REQUESTED:
return "REASON_OPT_OUT_REQUESTED";
default:

5
apex/jobscheduler/framework/java/com/android/server/usage/AppStandbyInternal.java
View File

@@ -218,6 +218,11 @@ public interface AppStandbyInternal {
void setActiveAdminApps(Set<String> adminPkgs, int userId);
/**
* @return {@code true} if the given package is an active device admin app.
*/
boolean isActiveDeviceAdmin(String packageName, int userId);
void onAdminDataAvailable();
void clearCarrierPrivilegedApps();

3
apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java
View File

@@ -1799,7 +1799,8 @@ public class AppStandbyController
}
@VisibleForTesting
boolean isActiveDeviceAdmin(String packageName, int userId) {
@Override
public boolean isActiveDeviceAdmin(String packageName, int userId) {
synchronized (mActiveAdminApps) {
final Set<String> adminPkgs = mActiveAdminApps.get(userId);
return adminPkgs != null && adminPkgs.contains(packageName);

1
core/proto/android/os/appbackgroundrestrictioninfo.proto
View File

@@ -176,6 +176,7 @@ message AppBackgroundRestrictionsInfo {
REASON_CARRIER_PRIVILEGED_APP = 321;
REASON_DPO_PROTECTED_APP = 322;
REASON_DISALLOW_APPS_CONTROL = 323;
REASON_ACTIVE_DEVICE_ADMIN = 324;
// app requested to be exempt
REASON_OPT_OUT_REQUESTED = 1000;
}

1
packages/SystemUI/src/com/android/systemui/qs/FgsManagerController.kt
View File

@@ -462,6 +462,7 @@ class FgsManagerController @Inject constructor(
PowerExemptionManager.REASON_DISALLOW_APPS_CONTROL,
PowerExemptionManager.REASON_DPO_PROTECTED_APP,
PowerExemptionManager.REASON_PROFILE_OWNER,
PowerExemptionManager.REASON_ACTIVE_DEVICE_ADMIN,
PowerExemptionManager.REASON_PROC_STATE_PERSISTENT,
PowerExemptionManager.REASON_PROC_STATE_PERSISTENT_UI,
PowerExemptionManager.REASON_ROLE_DIALER,

4
services/core/java/com/android/server/am/AppRestrictionController.java
View File

@@ -55,6 +55,7 @@ import static android.content.Intent.ACTION_SHOW_FOREGROUND_SERVICE_MANAGER;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
import static android.content.pm.PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS;
import static android.os.PowerExemptionManager.REASON_ACTIVE_DEVICE_ADMIN;
import static android.os.PowerExemptionManager.REASON_ALLOWLISTED_PACKAGE;
import static android.os.PowerExemptionManager.REASON_CARRIER_PRIVILEGED_APP;
import static android.os.PowerExemptionManager.REASON_COMPANION_DEVICE_MANAGER;
@@ -2777,6 +2778,7 @@ public final class AppRestrictionController {
if (packages != null) {
final AppOpsManager appOpsManager = mInjector.getAppOpsManager();
final PackageManagerInternal pm = mInjector.getPackageManagerInternal();
final AppStandbyInternal appStandbyInternal = mInjector.getAppStandbyInternal();
for (String pkg : packages) {
if (appOpsManager.checkOpNoThrow(AppOpsManager.OP_ACTIVATE_VPN,
uid, pkg) == AppOpsManager.MODE_ALLOWED) {
@@ -2794,6 +2796,8 @@ public final class AppRestrictionController {
return REASON_SYSTEM_ALLOW_LISTED;
} else if (pm.isPackageStateProtected(pkg, userId)) {
return REASON_DPO_PROTECTED_APP;
} else if (appStandbyInternal.isActiveDeviceAdmin(pkg, userId)) {
return REASON_ACTIVE_DEVICE_ADMIN;
}
}
}