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

am: 2c8c86dec7

Change-Id: I7cb355a6dd95cf72dd1c1a458c4d25f6b7e36cf3

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;