commit f366c35bb5664eda040a5aabf814d608c3a45567
author Hongwei Wang <hwwang@google.com> Tue Sep 15 21:52:35 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 15 21:52:35 2020 +0000
tree c49969f8229f20e906cdf76218f1d432b20ceb4a
parent 8bfb65d2d28afef4ce006ae5bdd50541f8b4ab2b
parent c993b0314baf13bd2f9aba82528a841e4b217c23

Merge "Log the application uid in PipUiEventLogger"

packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java b/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java
index 8bcaa8a..22adbb7 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java
@@ -17,6 +17,7 @@
 package com.android.systemui.pip;
 
 import android.app.TaskInfo;
+import android.content.pm.PackageManager;
 
 import com.android.internal.logging.UiEvent;
 import com.android.internal.logging.UiEventLogger;
@@ -28,26 +29,48 @@
 @SysUISingleton
 public class PipUiEventLogger {
 
+    private static final int INVALID_PACKAGE_UID = -1;
+
     private final UiEventLogger mUiEventLogger;
+    private final PackageManager mPackageManager;
 
-    private TaskInfo mTaskInfo;
+    private String mPackageName;
+    private int mPackageUid = INVALID_PACKAGE_UID;
 
-    public PipUiEventLogger(UiEventLogger uiEventLogger) {
+    public PipUiEventLogger(UiEventLogger uiEventLogger, PackageManager packageManager) {
         mUiEventLogger = uiEventLogger;
+        mPackageManager = packageManager;
     }
 
     public void setTaskInfo(TaskInfo taskInfo) {
-        mTaskInfo = taskInfo;
+        if (taskInfo == null) {
+            mPackageName = null;
+            mPackageUid = INVALID_PACKAGE_UID;
+        } else {
+            mPackageName = taskInfo.topActivity.getPackageName();
+            mPackageUid = getUid(mPackageName, taskInfo.userId);
+        }
     }
 
     /**
      * Sends log via UiEvent, reference go/uievent for how to debug locally
      */
     public void log(PipUiEventEnum event) {
-        if (mTaskInfo == null) {
+        if (mPackageName == null || mPackageUid == INVALID_PACKAGE_UID) {
             return;
         }
-        mUiEventLogger.log(event, mTaskInfo.userId, mTaskInfo.topActivity.getPackageName());
+        mUiEventLogger.log(event, mPackageUid, mPackageName);
+    }
+
+    private int getUid(String packageName, int userId) {
+        int uid = INVALID_PACKAGE_UID;
+        try {
+            uid = mPackageManager.getApplicationInfoAsUser(
+                    packageName, 0 /* ApplicationInfoFlags */, userId).uid;
+        } catch (PackageManager.NameNotFoundException e) {
+            // do nothing.
+        }
+        return uid;
     }
 
     /**

packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java

diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
index 3faa8a7..7c129ac 100644
--- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
+++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
@@ -17,6 +17,7 @@
 package com.android.systemui.wmshell;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.util.DisplayMetrics;
 import android.view.IWindowManager;
@@ -76,8 +77,9 @@
 
     @SysUISingleton
     @Provides
-    static PipUiEventLogger providePipUiEventLogger(UiEventLogger uiEventLogger) {
-        return new PipUiEventLogger(uiEventLogger);
+    static PipUiEventLogger providePipUiEventLogger(UiEventLogger uiEventLogger,
+            PackageManager packageManager) {
+        return new PipUiEventLogger(uiEventLogger, packageManager);
     }
 
     @SysUISingleton