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

Commit 6e3e6cbe authored by David Chen's avatar David Chen
Browse files

Updates atoms.proto for statsd. 

Updates numbering for pulled atoms to start at 10,000 so we have more
room to add more pushed atoms. Also fixes definition for dropbox
error added to more efficiently encode -1, and include the package
name when it's available.

Test: Tested the dropbox atom is logged without crashing on marlin.
Change-Id: I096911e3fe134320f2b1c6f545b0f479c7199612
parent dc4cb146

cmds/statsd/src/atoms.proto

+21 −18
Original line number Diff line number Diff line
@@ -84,22 +84,22 @@ message Atom { 
        // TODO: Reorder the numbering so that the most frequent occur events occur in the first 15.

    }



    // Pulled events will start at field 1000.

    // Pulled events will start at field 10000.

    oneof pulled {

        WifiBytesTransfer wifi_bytes_transfer = 1000;

        WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 1001;

        MobileBytesTransfer mobile_bytes_transfer = 1002;

        MobileBytesTransferByFgBg mobile_bytes_transfer_by_fg_bg = 1003;

        KernelWakelock kernel_wakelock = 1004;

        PlatformSleepState platform_sleep_state = 1005;

        SleepStateVoter sleep_state_voter = 1006;

        SubsystemSleepState subsystem_sleep_state = 1007;

        CpuTimePerFreq cpu_time_per_freq = 1008;

        CpuTimePerUid cpu_time_per_uid = 1009;

        CpuTimePerUidFreq cpu_time_per_uid_freq = 1010;

        WifiActivityEnergyInfo wifi_activity_energy_info = 1011;

        ModemActivityInfo modem_activity_info = 1012;

        AttributionChainDummyAtom attribution_chain_dummy_atom = 10000;

        WifiBytesTransfer wifi_bytes_transfer = 10000;

        WifiBytesTransferByFgBg wifi_bytes_transfer_by_fg_bg = 10001;

        MobileBytesTransfer mobile_bytes_transfer = 10002;

        MobileBytesTransferByFgBg mobile_bytes_transfer_by_fg_bg = 10003;

        KernelWakelock kernel_wakelock = 10004;

        PlatformSleepState platform_sleep_state = 10005;

        SleepStateVoter sleep_state_voter = 10006;

        SubsystemSleepState subsystem_sleep_state = 10007;

        CpuTimePerFreq cpu_time_per_freq = 10008;

        CpuTimePerUid cpu_time_per_uid = 10009;

        CpuTimePerUidFreq cpu_time_per_uid_freq = 10010;

        WifiActivityEnergyInfo wifi_activity_energy_info = 10011;

        ModemActivityInfo modem_activity_info = 10012;

        AttributionChainDummyAtom attribution_chain_dummy_atom = 100000;

    }

}
@@ -800,16 +800,19 @@ message DropboxErrorChanged { 
    optional string process_name = 3;



    // The pid if available. -1 means not available.

    optional int32 pid = 4;

    optional sint32 pid = 4;



    // 1 indicates is instant app. -1 indicates Not applicable.

    optional int32 is_instant_app = 5;

    optional sint32 is_instant_app = 5;



    // The activity name if available.

    optional string activity_name = 6;



    // The package name if available.

    optional string package_name = 7;



    // 1 indicates in foreground. -1 indicates not available.

    optional int32 is_foreground = 7;

    optional sint32 is_foreground = 8;

}



/*

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -14843,6 +14843,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                (process != null && process.info != null) ?

                        (process.info.isInstantApp() ? 1 : 0) : -1,

                activity != null ? activity.shortComponentName : null,

                activity != null ? activity.packageName : null,

                process != null ? (process.isInterestingToUserLocked() ? 1 : 0) : -1);















        // Rate-limit how often we're willing to do the heavy lifting below to