From 0edcacb14c2e6b28fcc5c14bc624b2e4e2dae1b7 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 24 May 2019 13:48:55 -0700 Subject: [PATCH] Add null check for component name when fetching uid Bug: 133442663 Test: Bug is not reproducible, but this is just adding a null check Change-Id: Iaf4231b4b3b1e6e35ab7e7f7cac86a192ad7cd9b --- .../com/android/internal/os/logging/MetricsLoggerWrapper.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java b/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java index bfe3780b64483..8bb1e48201bbc 100644 --- a/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java +++ b/core/java/com/android/internal/os/logging/MetricsLoggerWrapper.java @@ -72,6 +72,9 @@ public class MetricsLoggerWrapper { */ private static int getUid(Context context, ComponentName componentName, int userId) { int uid = -1; + if (componentName == null) { + return uid; + } try { uid = context.getPackageManager().getApplicationInfoAsUser( componentName.getPackageName(), 0, userId).uid;