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

Merge "tracing: add instrumentation for tracing service reports" am: da6c7062c6 am: 0b53d3bb99

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972645

Change-Id: I13e19b685687068a8050b0ce9f46620bdf9c9e8f
This commit is contained in:
Treehugger Robot
2022-02-11 15:04:09 +00:00
committed by Automerger Merge Worker
parent 64d4a8e01a 0b53d3bb99
commit 9c5a17d47e
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/tracing/TracingServiceProxy.java
View File

@@ -15,6 +15,13 @@
*/ */
package com.android.server.tracing; package com.android.server.tracing;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_BEGIN;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_BIND_PERM_INCORRECT;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_COMM_ERROR;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_HANDOFF;
import static com.android.internal.util.FrameworkStatsLog.TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_PERM_MISSING;
import android.Manifest; import android.Manifest;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.content.ComponentName; import android.content.ComponentName;
@@ -39,6 +46,7 @@ import android.util.LruCache;
import android.util.Slog; import android.util.Slog;
import com.android.internal.infra.ServiceConnector; import com.android.internal.infra.ServiceConnector;
import com.android.internal.util.FrameworkStatsLog;
import com.android.server.SystemService; import com.android.server.SystemService;
import java.io.IOException; import java.io.IOException;
@@ -71,6 +79,17 @@ public class TracingServiceProxy extends SystemService {
private static final String INTENT_ACTION_NOTIFY_SESSION_STOLEN = private static final String INTENT_ACTION_NOTIFY_SESSION_STOLEN =
"com.android.traceur.NOTIFY_SESSION_STOLEN"; "com.android.traceur.NOTIFY_SESSION_STOLEN";
private static final int REPORT_BEGIN =
TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_BEGIN;
private static final int REPORT_SVC_HANDOFF =
TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_HANDOFF;
private static final int REPORT_BIND_PERM_INCORRECT =
TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_BIND_PERM_INCORRECT;
private static final int REPORT_SVC_PERM_MISSING =
TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_PERM_MISSING;
private static final int REPORT_SVC_COMM_ERROR =
TRACING_SERVICE_REPORT_EVENT__EVENT__TRACING_SERVICE_REPORT_SVC_COMM_ERROR;
private final Context mContext; private final Context mContext;
private final PackageManager mPackageManager; private final PackageManager mPackageManager;
private final LruCache<ComponentName, ServiceConnector<IMessenger>> mCachedReporterServices; private final LruCache<ComponentName, ServiceConnector<IMessenger>> mCachedReporterServices;
@@ -134,17 +153,24 @@ public class TracingServiceProxy extends SystemService {
} }
private void reportTrace(@NonNull TraceReportParams params) { private void reportTrace(@NonNull TraceReportParams params) {
FrameworkStatsLog.write(TRACING_SERVICE_REPORT_EVENT, REPORT_BEGIN,
params.uuidLsb, params.uuidMsb);
// We don't need to do any permission checks on the caller because access // We don't need to do any permission checks on the caller because access
// to this service is guarded by SELinux. // to this service is guarded by SELinux.
ComponentName component = new ComponentName(params.reporterPackageName, ComponentName component = new ComponentName(params.reporterPackageName,
params.reporterClassName); params.reporterClassName);
if (!hasBindServicePermission(component)) { if (!hasBindServicePermission(component)) {
FrameworkStatsLog.write(TRACING_SERVICE_REPORT_EVENT, REPORT_BIND_PERM_INCORRECT,
params.uuidLsb, params.uuidMsb);
return; return;
} }
boolean hasDumpPermission = hasPermission(component, Manifest.permission.DUMP); boolean hasDumpPermission = hasPermission(component, Manifest.permission.DUMP);
boolean hasUsageStatsPermission = hasPermission(component, boolean hasUsageStatsPermission = hasPermission(component,
Manifest.permission.PACKAGE_USAGE_STATS); Manifest.permission.PACKAGE_USAGE_STATS);
if (!hasDumpPermission || !hasUsageStatsPermission) { if (!hasDumpPermission || !hasUsageStatsPermission) {
FrameworkStatsLog.write(TRACING_SERVICE_REPORT_EVENT, REPORT_SVC_PERM_MISSING,
params.uuidLsb, params.uuidMsb);
return; return;
} }
final long ident = Binder.clearCallingIdentity(); final long ident = Binder.clearCallingIdentity();
@@ -178,8 +204,13 @@ public class TracingServiceProxy extends SystemService {
message.what = TraceReportService.MSG_REPORT_TRACE; message.what = TraceReportService.MSG_REPORT_TRACE;
message.obj = params; message.obj = params;
messenger.send(message); messenger.send(message);
FrameworkStatsLog.write(TRACING_SERVICE_REPORT_EVENT, REPORT_SVC_HANDOFF,
params.uuidLsb, params.uuidMsb);
}).whenComplete((res, err) -> { }).whenComplete((res, err) -> {
if (err != null) { if (err != null) {
FrameworkStatsLog.write(TRACING_SERVICE_REPORT_EVENT, REPORT_SVC_COMM_ERROR,
params.uuidLsb, params.uuidMsb);
Slog.e(TAG, "Failed to report trace", err); Slog.e(TAG, "Failed to report trace", err);
} }
try { try {