Log the application uid in PipUiEventLogger
Regression from ag/12132203, we should log the application uid instead
of the running user id.
Bug: 168342514
Test: $ANDROID_HOST_OUT/bin/statsd_testdrive -terse 90
Merged-In: If5d1bfe9ce38ea21bb9e5e13f51622f732dd85b9
Change-Id: If5d1bfe9ce38ea21bb9e5e13f51622f732dd85b9
diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java b/packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java
index 5e2cd9c..9702035 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;
@@ -31,27 +32,49 @@
@Singleton
public class PipUiEventLogger {
- private final UiEventLogger mUiEventLogger;
+ private static final int INVALID_PACKAGE_UID = -1;
- private TaskInfo mTaskInfo;
+ private final UiEventLogger mUiEventLogger;
+ private final PackageManager mPackageManager;
+
+ private String mPackageName;
+ private int mPackageUid = INVALID_PACKAGE_UID;
@Inject
- 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;
}
/**