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

Commit b0d14a0e authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Update the PendingIntent to launch Settings on bg restriction alert" into tm-dev

parents f2acd204 8abd49be

services/core/java/com/android/server/am/AppRestrictionController.java

+5 −3
Original line number Diff line number Diff line
@@ -2292,9 +2292,10 @@ public final class AppRestrictionController { 
        void postRequestBgRestrictedIfNecessary(String packageName, int uid) {

            final Intent intent = new Intent(Settings.ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL);

            intent.setData(Uri.fromParts(PACKAGE_SCHEME, packageName, null));

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            final PendingIntent pendingIntent = PendingIntent.getActivityAsUser(mContext, 0,

                    intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, null,

                    intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, null,

                    UserHandle.of(UserHandle.getUserId(uid)));

            Notification.Action[] actions = null;

            final boolean hasForegroundServices =
@@ -2350,13 +2351,14 @@ public final class AppRestrictionController { 
                intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                // Task manager runs in SystemUI, which is SYSTEM user only.

                pendingIntent = PendingIntent.getBroadcastAsUser(mContext, 0,

                        intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                        intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                        UserHandle.SYSTEM);

            } else {

                final Intent intent = new Intent(Settings.ACTION_VIEW_ADVANCED_POWER_USAGE_DETAIL);

                intent.setData(Uri.fromParts(PACKAGE_SCHEME, packageName, null));

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                pendingIntent = PendingIntent.getActivityAsUser(mContext, 0,

                        intent, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                        intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                        null, UserHandle.of(UserHandle.getUserId(uid)));

            }