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

Commit 6e9416f3 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Switch to task manager on tapping on long-running FGS alerts." into tm-dev am: 1016a192 

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

Change-Id: I89adbbd6d5b8ee16be4a266c3988530617e579e2
parents 8d567289 1016a192

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

+6 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ public final class AppRestrictionController { 
    /**

     * Whether or not to show the foreground service manager on tapping notifications.

     */

    private static final boolean ENABLE_SHOW_FOREGROUND_SERVICE_MANAGER = false;

    private static final boolean ENABLE_SHOW_FOREGROUND_SERVICE_MANAGER = true;



    private final Context mContext;

    private final HandlerThread mBgHandlerThread;
@@ -1595,8 +1595,8 @@ public final class AppRestrictionController { 
                        cancelRequestBgRestrictedIfNecessary(packageName, uid);

                        final Intent newIntent = new Intent(ACTION_SHOW_FOREGROUND_SERVICE_MANAGER);

                        newIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

                        mContext.sendBroadcastAsUser(newIntent,

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

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

                        mContext.sendBroadcastAsUser(newIntent, UserHandle.SYSTEM);

                        break;

                }

            }
@@ -1670,9 +1670,10 @@ public final class AppRestrictionController { 
            if (ENABLE_SHOW_FOREGROUND_SERVICE_MANAGER) {

                final Intent intent = new Intent(ACTION_SHOW_FOREGROUND_SERVICE_MANAGER);

                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,

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

                        UserHandle.SYSTEM);

            } else {

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

                intent.setData(Uri.fromParts(PACKAGE_SCHEME, packageName, null));
@@ -1750,7 +1751,7 @@ public final class AppRestrictionController { 
                    SYSTEM_UID, UserHandle.getUserId(uid));

            final String title = mContext.getString(titleRes);

            final String message = mContext.getString(messageRes,

                    ai != null ? pm.getText(packageName, ai.labelRes, ai) : packageName);

                    ai != null ? ai.loadLabel(pm) : packageName);

            final Icon icon = ai != null ? Icon.createWithResource(packageName, ai.icon) : null;



            postNotification(notificationId, packageName, uid, title, message, icon, pendingIntent,