From 13c5549834a0dbdf02bb33929d5c3d7dcf8a21d0 Mon Sep 17 00:00:00 2001
From: Sanguk Jeon <uky.jeon@samsung.com>
Date: Sat, 20 Nov 2021 09:57:33 +0900
Subject: [PATCH] Guard against NPE in ThreadedRenderer

Bug: b/168319139
Test: compile & verify basic functions working

Change-Id: Iaa2a6b7362d31f3501b3dd67f5af790ba3aebd24
---
 core/java/android/view/ThreadedRenderer.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 7af77ca263fef..00754af6a853f 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -613,7 +613,10 @@ public final class ThreadedRenderer extends HardwareRenderer {
         // If there's no arguments, eg 'dumpsys gfxinfo', then dump everything.
         // If there's a targetted package, eg 'dumpsys gfxinfo com.android.systemui', then only
         // dump the summary information
-        int flags = (args == null || args.length == 0) ? FLAG_DUMP_ALL : 0;
+        if (args == null || args.length == 0) {
+            return FLAG_DUMP_ALL;
+        }
+        int flags = 0;
         for (int i = 0; i < args.length; i++) {
             switch (args[i]) {
                 case "framestats":