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

Merge "Log the application uid in PipUiEventLogger"

Browse Source
This commit is contained in:
Hongwei Wang
2020-09-15 21:52:35 +00:00
committed by Android (Google) Code Review
parent 8bfb65d2d2 c993b0314b
commit f366c35bb5
2 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 @@ import com.android.systemui.dagger.SysUISingleton;
@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;
}
/**

6
packages/SystemUI/src/com/android/systemui/wmshell/WMShellBaseModule.java
View File

@@ -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 @@ public abstract class WMShellBaseModule {
@SysUISingleton
@Provides
static PipUiEventLogger providePipUiEventLogger(UiEventLogger uiEventLogger) {
return new PipUiEventLogger(uiEventLogger);
static PipUiEventLogger providePipUiEventLogger(UiEventLogger uiEventLogger,
PackageManager packageManager) {
return new PipUiEventLogger(uiEventLogger, packageManager);
}
@SysUISingleton