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

Commit 5953a338 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents dd88792a 8b37c093

src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/fuelgauge/BatteryUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/spa/app/appinfo/PackageInfoPresenter.kt

+2 −1
Original line number Diff line number Diff line
@@ -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)

        }