Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log the application uid in PipUiEventLogger" into rvc-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-09-15 23:00:29 +00:00
committed by Android (Google) Code Review
parent 7419f4d018 80e875fad6
commit 6aba13796f
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/SystemUI/src/com/android/systemui/pip/PipUiEventLogger.java
View File

@@ -17,6 +17,7 @@
package com.android.systemui.pip; package com.android.systemui.pip;
import android.app.TaskInfo; import android.app.TaskInfo;
import android.content.pm.PackageManager;
import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEvent;
import com.android.internal.logging.UiEventLogger; import com.android.internal.logging.UiEventLogger;
@@ -31,27 +32,49 @@ import javax.inject.Singleton;
@Singleton @Singleton
public class PipUiEventLogger { 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 @Inject
public PipUiEventLogger(UiEventLogger uiEventLogger) { public PipUiEventLogger(UiEventLogger uiEventLogger, PackageManager packageManager) {
mUiEventLogger = uiEventLogger; mUiEventLogger = uiEventLogger;
mPackageManager = packageManager;
} }
public void setTaskInfo(TaskInfo taskInfo) { 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 * Sends log via UiEvent, reference go/uievent for how to debug locally
*/ */
public void log(PipUiEventEnum event) { public void log(PipUiEventEnum event) {
if (mTaskInfo == null) { if (mPackageName == null || mPackageUid == INVALID_PACKAGE_UID) {
return; 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;
} }
/** /**