Merge "Add null check for component name when fetching uid" into qt-dev am: 35d6deced8

am: 99e4162dd3 Change-Id: If8cd019c8111f9b5c12421aee2608aee5974de95
2019-05-24 18:07:29 -07:00
parent 734be2cd14 99e4162dd3
commit 2c8c86dec7
1 changed files with 3 additions and 0 deletions
--- 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;