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

Commit 18216d97 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Fix FSI not launching when locked" into udc-dev

parents 3656c6e1 bac1ea97
Loading
Loading
Loading
Loading
+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;