From 8b37c093b79d9262fb0426c443e9d5c1e9cb52ca Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Thu, 16 May 2024 11:34:38 -0700 Subject: [PATCH] Add a source parameter for resrictions logging Modify existing callers to use the new parameter Bug: 341112680 Test: statsd_testdrive 866 Manually change battery restriction level for an app Flag: android.app.app_restrictions_api Change-Id: I66f23341b90f96eb3091b94ab6db512570988643 --- .../applications/appinfo/AppButtonsPreferenceController.java | 3 ++- src/com/android/settings/fuelgauge/BatteryUtils.java | 2 +- .../android/settings/spa/app/appinfo/PackageInfoPresenter.kt | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index 53de7c59d51..1d80099f5c3 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -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); diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index b53bf477104..9e08664c901 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -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); diff --git a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt index d5ce3af8e89..8dbcb14e83b 100644 --- a/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt +++ b/src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt @@ -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) }