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

Commit 10cdadb7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Make PI created by AlertWindowNotification immutable" into rvc-dev am: de2933d5 

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

Change-Id: Ia0219c2cea69e0e283b0c2e7f16992d464116d97
parents e2df08a2 de2933d5

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

+3 −1
Original line number Original line 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.NotificationManager.IMPORTANCE_MIN;

import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;

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.Context.NOTIFICATION_SERVICE;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

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

                Uri.fromParts("package", packageName, null));

        intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);

        intent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);

        // Calls into activity manager...

        // 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) {

    private void createNotificationChannel(Context context, String appName) {