summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-11-29 23:30:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-11-29 23:30:20 +0000
commitdef675bcf304cf46121d4130d66cc6621801ac3f (patch)
tree51514cbab97110b7208bf686c500e5336bdb07d2 /core/java/android
parent0e4272d4d1258998188ee5b75dcb9262a74986b0 (diff)
parent13c5549834a0dbdf02bb33929d5c3d7dcf8a21d0 (diff)
Merge "Guard against NPE in ThreadedRenderer"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/ThreadedRenderer.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 7af77ca263fe..00754af6a853 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":