From 13a360db49a64225c6db7c7c8eff2c4057d40f80 Mon Sep 17 00:00:00 2001
From: Mark White <anothermark@google.com>
Date: Thu, 14 Nov 2024 15:39:39 +0000
Subject: Fix NPE in PlatformCompat

Change-Id: I01c8aa5a21bc2e385c27e42d66452c9e6303b729
Flag: EXEMPT bugfix
Fix: 379058950
Test: presubmit
---
 services/core/java/com/android/server/compat/PlatformCompat.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java
index eeac26031719..6feae34f1a2d 100644
--- a/services/core/java/com/android/server/compat/PlatformCompat.java
+++ b/services/core/java/com/android/server/compat/PlatformCompat.java
@@ -522,7 +522,7 @@ public class PlatformCompat extends IPlatformCompat.Stub {
         // b/282922910 - we don't want apps sharing system uid and targeting
         // older target sdk to impact all system uid apps
         if (Flags.systemUidTargetSystemSdk() && !mIsWear &&
-                uid == Process.SYSTEM_UID) {
+                uid == Process.SYSTEM_UID && appInfo != null) {
             appInfo.targetSdkVersion = Build.VERSION.SDK_INT;
         }
         return appInfo;
-- 
cgit v1.2.3-59-g8ed1b