PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a source parameter for resrictions logging" into main

Browse Source
This commit is contained in:
Amith Yamasani
2024-05-23 18:54:49 +00:00
committed by Android (Google) Code Review
parent dd88792a5b 8b37c093b7
commit 5953a3386c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
View File

@@ -559,7 +559,8 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
if (android.app.Flags.appRestrictionsApi()) {
am.noteAppRestrictionEnabled(pkgName, mAppEntry.info.uid,
ActivityManager.RESTRICTION_LEVEL_FORCE_STOPPED, true,
ActivityManager.RESTRICTION_REASON_USER, "settings", 0L);
ActivityManager.RESTRICTION_REASON_USER,
"settings", ActivityManager.RESTRICTION_SOURCE_USER, 0L);
}
am.forceStopPackage(pkgName);
int userId = UserHandle.getUserId(mAppEntry.info.uid);

2
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -393,7 +393,7 @@ public class BatteryUtils {
packageName, uid, ActivityManager.RESTRICTION_LEVEL_BACKGROUND_RESTRICTED,
mode == AppOpsManager.MODE_IGNORED,
ActivityManager.RESTRICTION_REASON_USER,
"settings", 0);
"settings", ActivityManager.RESTRICTION_SOURCE_USER, 0L);
}
// Control whether app could run jobs in the background
mAppOpsManager.setMode(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, uid, packageName, mode);

3
src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt
View File

@@ -160,7 +160,8 @@ class PackageInfoPresenter(
context.activityManager.noteAppRestrictionEnabled(
packageName, uid,
ActivityManager.RESTRICTION_LEVEL_FORCE_STOPPED, true,
ActivityManager.RESTRICTION_REASON_USER, "settings", 0)
ActivityManager.RESTRICTION_REASON_USER, "settings",
ActivityManager.RESTRICTION_SOURCE_USER, 0)
}
context.activityManager.forceStopPackageAsUser(packageName, userId)
}