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

Commit b8489f08 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Fix FSI not launching when locked" into udc-dev am: 18216d97 am: f206336f 

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



Change-Id: I199fb9351b1dba5636e3317aa31c02cc42007296
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 360de11b f206336f

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+9 −1
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;

import static android.service.notification.NotificationListenerService.REASON_CLICK;



import static com.android.systemui.statusbar.phone.CentralSurfaces.getActivityOptions;



import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.KeyguardManager;

import android.app.Notification;

import android.app.PendingIntent;
@@ -579,8 +581,14 @@ class StatusBarNotificationActivityStarter implements NotificationActivityStarte 
            EventLog.writeEvent(EventLogTags.SYSUI_FULLSCREEN_NOTIFICATION,

                    entry.getKey());

            mCentralSurfaces.wakeUpForFullScreenIntent();

            fullScreenIntent.send();



            ActivityOptions options = ActivityOptions.makeBasic();

            options.setPendingIntentBackgroundActivityStartMode(

                    MODE_BACKGROUND_ACTIVITY_START_ALLOWED);

            fullScreenIntent.sendAndReturnResult(null, 0, null, null, null, null,

                    options.toBundle());

            entry.notifyFullScreenIntentLaunched();



            mMetricsLogger.count("note_fullscreen", 1);



            String activityName;