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

Commit 7c7a1ba3 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17760593



Change-Id: I461c234f90f020a63dc5714fa0a7d7bed5b70d02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12fea198 12e6a218

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)));