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

Commit 077149f3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Make PI created by AlertWindowNotification immutable" into... 

Merge "Merge "Make PI created by AlertWindowNotification immutable" into rvc-dev am: de2933d5 am: 3a505ce3 am: 0e8f52ff" into rvc-qpr-dev-plus-aosp am: 31135973

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

Change-Id: I5a2983472ea3a67e0664f7fbc40278579d7ef0d1
parents fa40284b 31135973

services/core/java/com/android/server/wm/AlertWindowNotification.java

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.wm; 


import static android.app.NotificationManager.IMPORTANCE_MIN;

import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;

import static android.app.PendingIntent.FLAG_IMMUTABLE;

import static android.content.Context.NOTIFICATION_SERVICE;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
@@ -139,7 +140,8 @@ class AlertWindowNotification { 
                Uri.fromParts("package", packageName, null));

        intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);

        // Calls into activity manager...

        return PendingIntent.getActivity(context, mRequestCode, intent, FLAG_CANCEL_CURRENT);

        return PendingIntent.getActivity(context, mRequestCode, intent,

                FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);

    }



    private void createNotificationChannel(Context context, String appName) {