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

Commit 0308261c authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Merge "Migrate NetworkStack metrics off StatsLog.write" into qt-dev am: fa124d7b 

am: fb21fb87

Change-Id: I3d3cf3cb3570ed4def645e283179cadbf4826f9c
parents f13b9988 fb21fb87

cmds/statsd/src/atoms.proto

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ message Atom { 
            119 [(log_from_module) = "docsui"];

        DocsUISearchTypeReported docs_ui_search_type_reported =

            120 [(log_from_module) = "docsui"];

        DataStallEvent data_stall_event = 121;

        DataStallEvent data_stall_event = 121 [(log_from_module) = "network_stack"];

        RescuePartyResetReported rescue_party_reset_reported = 122;

        SignedConfigReported signed_config_reported = 123;

        GnssNiEventReported gnss_ni_event_reported = 124;
@@ -269,7 +269,7 @@ message Atom { 
        StyleUIChanged style_ui_changed = 179;

        PrivacyIndicatorsInteracted privacy_indicators_interacted = 180;

        AppInstallOnExternalStorageReported app_install_on_external_storage_reported = 181;

        NetworkStackReported network_stack_reported = 182;

        NetworkStackReported network_stack_reported = 182 [(log_from_module) = "network_stack"];

        AppMovedStorageReported app_moved_storage_reported = 183;

        BiometricEnrolled biometric_enrolled = 184;

        SystemServerWatchdogOccurred system_server_watchdog_occurred = 185;

core/java/android/util/StatsLog.java

+0 −5
Original line number Diff line number Diff line
@@ -198,11 +198,6 @@ public final class StatsLog extends StatsLogInternal { 
                write(id, (long) params[0], (int) params[1], (String) params[2], (String) params[3],

                        (boolean) params[4], (int) params[5]);

                break;

            case DATA_STALL_EVENT:

                // Refer to the defintion in frameworks/base/cmds/statsd/src/atoms.proto.

                write(id, (int) params[0], (int) params[1], (int) params[2], (byte[]) params[3],

                        (byte[]) params[4], (byte[]) params[5]);

                break;

        }

    }

packages/NetworkStack/Android.bp

+9 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ android_library { 
        "src/**/*.java",

        ":framework-networkstack-shared-srcs",

        ":services-networkstack-shared-srcs",

        ":statslog-networkstack-java-gen",

    ],

    static_libs: [

        "androidx.annotation_annotation",
@@ -104,3 +105,11 @@ android_app { 
    certificate: "networkstack",

    manifest: "AndroidManifest.xml",

}



genrule {

    name: "statslog-networkstack-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +

         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog",

    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],

}

packages/NetworkStack/src/android/net/metrics/DataStallDetectionStats.java→packages/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.net.metrics;

package com.android.networkstack.metrics;



import android.annotation.NonNull;

import android.annotation.Nullable;

packages/NetworkStack/src/android/net/metrics/DataStallStatsUtils.java→packages/NetworkStack/src/com/android/networkstack/metrics/DataStallStatsUtils.java

+2 −6
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
 * limitations under the License.

 */



package android.net.metrics;

package com.android.networkstack.metrics;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.net.captiveportal.CaptivePortalProbeResult;

import android.util.Log;

import android.util.StatsLog;



import com.android.internal.util.HexDump;

import com.android.server.connectivity.nano.DataStallEventProto;
@@ -37,13 +36,11 @@ import com.android.server.connectivity.nano.DataStallEventProto; 
 */

public class DataStallStatsUtils {

    private static final String TAG = DataStallStatsUtils.class.getSimpleName();

    private static final int DATA_STALL_EVENT_ID = 121;

    private static final boolean DBG = false;



    private static int probeResultToEnum(@Nullable final CaptivePortalProbeResult result) {

        if (result == null) return DataStallEventProto.INVALID;



        // TODO: Add partial connectivity support.

        if (result.isSuccessful()) {

            return DataStallEventProto.VALID;

        } else if (result.isPortal()) {
@@ -65,8 +62,7 @@ public class DataStallStatsUtils { 
            Log.d(TAG, "write: " + stats + " with result: " + validationResult

                    + ", dns: " + HexDump.toHexString(stats.mDns));

        }

        // TODO(b/124613085): Update API once the public StatsLog API is ready.

        StatsLog.write(DATA_STALL_EVENT_ID,

        NetworkStackStatsLog.write(NetworkStackStatsLog.DATA_STALL_EVENT,

                stats.mEvaluationType,

                validationResult,

                stats.mNetworkType,