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

Merge "Update statsd config to be mainline compatible." into sc-dev

Browse Source
This commit is contained in:
Alexander Dorokhine
2021-05-20 20:36:23 +00:00
committed by Android (Google) Code Review
parent c9429f43e0 a4354f989e
commit 83fbf50685
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apex/appsearch/service/Android.bp
View File

@@ -20,20 +20,31 @@ package {
default_applicable_licenses: ["frameworks_base_license"], default_applicable_licenses: ["frameworks_base_license"],
} }
genrule {
name: "statslog-appsearch-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module appsearch --javaPackage com.android.server.appsearch.stats --javaClass AppSearchStatsLog",
out: ["com/android/server/appsearch/stats/AppSearchStatsLog.java"],
}
java_library { java_library {
name: "service-appsearch", name: "service-appsearch",
installable: true, installable: true,
srcs: ["java/**/*.java"], srcs: [
libs: [ "java/**/*.java",
"framework", ":statslog-appsearch-java-gen",
"framework-appsearch",
"services.core",
"services.usage",
], ],
static_libs: [ static_libs: [
"icing-java-proto-lite", "icing-java-proto-lite",
"libicing-java", "libicing-java",
], ],
libs: [
"framework",
"framework-appsearch",
"framework-statsd.stubs.module_lib",
"services.core",
"services.usage",
],
required: [ required: [
"libicing", "libicing",
], ],

9
apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java
View File

@@ -30,7 +30,6 @@ import android.util.SparseIntArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.FrameworkStatsLog;
import com.android.server.appsearch.external.localstorage.AppSearchLogger; import com.android.server.appsearch.external.localstorage.AppSearchLogger;
import com.android.server.appsearch.external.localstorage.stats.CallStats; import com.android.server.appsearch.external.localstorage.stats.CallStats;
import com.android.server.appsearch.external.localstorage.stats.InitializeStats; import com.android.server.appsearch.external.localstorage.stats.InitializeStats;
@@ -237,7 +236,7 @@ public final class PlatformLogger implements AppSearchLogger {
String database = stats.getGeneralStats().getDatabase(); String database = stats.getGeneralStats().getDatabase();
try { try {
int hashCodeForDatabase = calculateHashCodeMd5(database); int hashCodeForDatabase = calculateHashCodeMd5(database);
FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_CALL_STATS_REPORTED, AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_CALL_STATS_REPORTED,
extraStats.mSamplingRatio, extraStats.mSamplingRatio,
extraStats.mSkippedSampleCount, extraStats.mSkippedSampleCount,
extraStats.mPackageUid, extraStats.mPackageUid,
@@ -269,7 +268,7 @@ public final class PlatformLogger implements AppSearchLogger {
String database = stats.getGeneralStats().getDatabase(); String database = stats.getGeneralStats().getDatabase();
try { try {
int hashCodeForDatabase = calculateHashCodeMd5(database); int hashCodeForDatabase = calculateHashCodeMd5(database);
FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_PUT_DOCUMENT_STATS_REPORTED, AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_PUT_DOCUMENT_STATS_REPORTED,
extraStats.mSamplingRatio, extraStats.mSamplingRatio,
extraStats.mSkippedSampleCount, extraStats.mSkippedSampleCount,
extraStats.mPackageUid, extraStats.mPackageUid,
@@ -306,7 +305,7 @@ public final class PlatformLogger implements AppSearchLogger {
String database = stats.getDatabase(); String database = stats.getDatabase();
try { try {
int hashCodeForDatabase = calculateHashCodeMd5(database); int hashCodeForDatabase = calculateHashCodeMd5(database);
FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_QUERY_STATS_REPORTED, AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_QUERY_STATS_REPORTED,
extraStats.mSamplingRatio, extraStats.mSamplingRatio,
extraStats.mSkippedSampleCount, extraStats.mSkippedSampleCount,
extraStats.mPackageUid, extraStats.mPackageUid,
@@ -349,7 +348,7 @@ public final class PlatformLogger implements AppSearchLogger {
mLastPushTimeMillisLocked = SystemClock.elapsedRealtime(); mLastPushTimeMillisLocked = SystemClock.elapsedRealtime();
ExtraStats extraStats = createExtraStatsLocked(/*packageName=*/ null, ExtraStats extraStats = createExtraStatsLocked(/*packageName=*/ null,
CallStats.CALL_TYPE_INITIALIZE); CallStats.CALL_TYPE_INITIALIZE);
FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_INITIALIZE_STATS_REPORTED, AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_INITIALIZE_STATS_REPORTED,
extraStats.mSamplingRatio, extraStats.mSamplingRatio,
extraStats.mSkippedSampleCount, extraStats.mSkippedSampleCount,
extraStats.mPackageUid, extraStats.mPackageUid,