Merge "Add null check for component name when fetching uid" into qt-dev

am: 35d6deced8 Change-Id: I458be4b7028f81d955bde72c75e64a98293f02b8
2019-05-24 17:53:05 -07:00
parent d19bed89f8 35d6deced8
commit 99e4162dd3
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;