Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8df90a4b authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Automerger Merge Worker
Browse files

Merge "Update statsd config to be mainline compatible." into sc-dev am: 83fbf506 am: e66799f3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14613135

Change-Id: I2e7b83d796f7d40f6112266147935a48c47c7e64
parents f02e281a e66799f3

apex/appsearch/service/Android.bp

+16 −5
Original line number Diff line number Diff line
@@ -20,20 +20,31 @@ package { 
    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 {

    name: "service-appsearch",

    installable: true,

    srcs: ["java/**/*.java"],

    srcs: [

        "java/**/*.java",

        ":statslog-appsearch-java-gen",

    ],

    static_libs: [

        "icing-java-proto-lite",

        "libicing-java",

    ],

    libs: [

        "framework",

        "framework-appsearch",

        "framework-statsd.stubs.module_lib",

        "services.core",

        "services.usage",

    ],

    static_libs: [

        "icing-java-proto-lite",

        "libicing-java",

    ],

    required: [

        "libicing",

    ],

apex/appsearch/service/java/com/android/server/appsearch/stats/PlatformLogger.java

+4 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.util.SparseIntArray; 


import com.android.internal.annotations.GuardedBy;

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.stats.CallStats;

import com.android.server.appsearch.external.localstorage.stats.InitializeStats;
@@ -237,7 +236,7 @@ public final class PlatformLogger implements AppSearchLogger { 
        String database = stats.getGeneralStats().getDatabase();

        try {

            int hashCodeForDatabase = calculateHashCodeMd5(database);

            FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_CALL_STATS_REPORTED,

            AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_CALL_STATS_REPORTED,

                    extraStats.mSamplingRatio,

                    extraStats.mSkippedSampleCount,

                    extraStats.mPackageUid,
@@ -269,7 +268,7 @@ public final class PlatformLogger implements AppSearchLogger { 
        String database = stats.getGeneralStats().getDatabase();

        try {

            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.mSkippedSampleCount,

                    extraStats.mPackageUid,
@@ -306,7 +305,7 @@ public final class PlatformLogger implements AppSearchLogger { 
        String database = stats.getDatabase();

        try {

            int hashCodeForDatabase = calculateHashCodeMd5(database);

            FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_QUERY_STATS_REPORTED,

            AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_QUERY_STATS_REPORTED,

                    extraStats.mSamplingRatio,

                    extraStats.mSkippedSampleCount,

                    extraStats.mPackageUid,
@@ -349,7 +348,7 @@ public final class PlatformLogger implements AppSearchLogger { 
        mLastPushTimeMillisLocked = SystemClock.elapsedRealtime();

        ExtraStats extraStats = createExtraStatsLocked(/*packageName=*/ null,

                CallStats.CALL_TYPE_INITIALIZE);

        FrameworkStatsLog.write(FrameworkStatsLog.APP_SEARCH_INITIALIZE_STATS_REPORTED,

        AppSearchStatsLog.write(AppSearchStatsLog.APP_SEARCH_INITIALIZE_STATS_REPORTED,

                extraStats.mSamplingRatio,

                extraStats.mSkippedSampleCount,

                extraStats.mPackageUid,