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

Commit df6ab700 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6512749 from fc2d79cc to mainline-release 

Change-Id: I571d2f14af2ec5f2394b13b4859a9834a53697f8
parents 0e3b59ed fc2d79cc

apex/statsd/service/java/com/android/server/stats/StatsCompanionService.java

+8 −3
Original line number Diff line number Diff line
@@ -662,14 +662,19 @@ public class StatsCompanionService extends IStatsCompanionService.Stub { 
            return;

        }



        // Cleann up from previous statsd - cancel any alarms that had been set. Do this here

        // instead of in binder death because statsd can come back and set different alarms, or not

        // want to set an alarm when it had been set. This guarantees that when we get a new statsd,

        // we cancel any alarms before it is able to set them.

        cancelAnomalyAlarm();

        cancelPullingAlarm();

        cancelAlarmForSubscriberTriggering();



        if (DEBUG) Log.d(TAG, "Saying hi to statsd");

        mStatsManagerService.statsdReady(statsd);

        try {

            statsd.statsCompanionReady();



            cancelAnomalyAlarm();

            cancelPullingAlarm();



            BroadcastReceiver appUpdateReceiver = new AppUpdateReceiver();

            BroadcastReceiver userUpdateReceiver = new UserUpdateReceiver();

            BroadcastReceiver shutdownEventReceiver = new ShutdownEventReceiver();

cmds/statsd/src/StatsLogProcessor.h

+5 −3
Original line number Diff line number Diff line
@@ -307,9 +307,6 @@ private: 
    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation);

    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition);

    FRIEND_TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);



    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_single_bucket);

    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_multiple_buckets);
@@ -328,6 +325,7 @@ private: 
    FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithSameDeactivation);

    FRIEND_TEST(MetricActivationE2eTest, TestCountMetricWithTwoMetricsTwoDeactivations);



    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedState);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
@@ -345,6 +343,10 @@ private: 
    FRIEND_TEST(DurationMetricE2eTest, TestSlicedStatePrimaryFieldsNotSubsetDimInWhat);

    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSubset);



    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

cmds/statsd/src/atoms.proto

+6 −0
Original line number Diff line number Diff line
@@ -6032,6 +6032,12 @@ message PackageNotificationChannelPreferences { 
    optional int32 user_locked_fields = 6;

    // Indicates if the channel was deleted by the app.

    optional bool is_deleted = 7;

    // Indicates if the channel was marked as a conversation by the app.

    optional bool is_conversation = 8;

    // Indicates if the channel is a conversation that was demoted by the user.

    optional bool is_demoted_conversation = 9;

    // Indicates if the channel is a conversation that was marked as important by the user.

    optional bool is_important_conversation = 10;

}



/**

cmds/statsd/src/metrics/MetricProducer.h

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ protected: 
    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithPrimaryFields);

    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);



    FRIEND_TEST(DurationMetricE2eTest, TestOneBucket);

    FRIEND_TEST(DurationMetricE2eTest, TestTwoBuckets);
@@ -488,6 +489,7 @@ protected: 
    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

};



}  // namespace statsd

cmds/statsd/src/metrics/MetricsManager.h

+5 −3
Original line number Diff line number Diff line
@@ -292,9 +292,6 @@ private: 
    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsWithActivation);

    FRIEND_TEST(GaugeMetricE2eTest, TestRandomSamplePulledEventsNoCondition);

    FRIEND_TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);



    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_single_bucket);

    FRIEND_TEST(AnomalyDetectionE2eTest, TestSlicedCountMetric_multiple_buckets);
@@ -322,6 +319,7 @@ private: 
            TestActivationOnBootMultipleActivationsDifferentActivationTypes);

    FRIEND_TEST(StatsLogProcessorTest, TestActivationsPersistAcrossSystemServerRestart);



    FRIEND_TEST(CountMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedState);

    FRIEND_TEST(CountMetricE2eTest, TestSlicedStateWithMap);

    FRIEND_TEST(CountMetricE2eTest, TestMultipleSlicedStates);
@@ -339,6 +337,10 @@ private: 
    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSuperset);

    FRIEND_TEST(DurationMetricE2eTest, TestWithSlicedStatePrimaryFieldsSubset);



    FRIEND_TEST(ValueMetricE2eTest, TestInitialConditionChanges);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_LateAlarm);

    FRIEND_TEST(ValueMetricE2eTest, TestPulledEvents_WithActivation);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithDimensions);

    FRIEND_TEST(ValueMetricE2eTest, TestInitWithSlicedState_WithIncorrectDimensions);