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

Commit 1cc44052 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE" into main

parents fc7c11e0 551c1432

core/java/com/android/internal/app/SuspendedAppActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ public class SuspendedAppActivity extends AlertActivity 
                .putExtra(Intent.EXTRA_USER_ID, userId)

                .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK

                        | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

        if (crossUserSuspensionEnabled()) {

        if (crossUserSuspensionEnabled() && suspendingPackage != null) {

            intent.putExtra(EXTRA_SUSPENDING_USER, suspendingPackage.userId);

        }

        return intent;