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

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

Merge "Add the flag "clear top" when launching battery settings view" into tm-dev

parents e48d4958 956ee7ed

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

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

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);



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

                    intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE, null,
@@ -2362,7 +2362,7 @@ public final class AppRestrictionController { 
            } 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);

                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

                pendingIntent = PendingIntent.getActivityAsUser(mContext, 0,

                        intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE,

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