From 71476359e912821ce421060e8fc56c9976f67d6a Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Wed, 30 Jul 2025 21:11:00 +0300
Subject: [PATCH] fix upstream NPE crash in
 UserAspectRatioDetails.launchApplication()

---
 .../applications/appcompat/UserAspectRatioDetails.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
index 10184bf1fa0..931a0bcfc42 100644
--- a/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
+++ b/src/com/android/settings/applications/appcompat/UserAspectRatioDetails.java
@@ -159,9 +159,9 @@ public class UserAspectRatioDetails extends AppInfoBase implements
     }
 
     private void launchApplication() {
-        Intent launchIntent = mPm.getLaunchIntentForPackage(mPackageName)
-                .addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
+        Intent launchIntent = mPm.getLaunchIntentForPackage(mPackageName);
         if (launchIntent != null) {
+            launchIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
             getContext().startActivityAsUser(launchIntent, new UserHandle(mUserId));
         }
     }