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

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

Snap for 5130385 from 78c941d0 to pi-qpr2-release 

Change-Id: I6c7f0d60f4522dee494ef6c84c520d2140b0aaee
parents 894d6a31 78c941d0

cmds/statsd/src/StatsLogProcessor.cpp

+13 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ const int FIELD_ID_STRINGS = 9; 


#define STATS_DATA_DIR "/data/misc/stats-data"



// Cool down period for writing data to disk to avoid overwriting files.

#define WRITE_DATA_COOL_DOWN_SEC 5



StatsLogProcessor::StatsLogProcessor(const sp<UidMap>& uidMap,

                                     const sp<AlarmMonitor>& anomalyAlarmMonitor,

                                     const sp<AlarmMonitor>& periodicAlarmMonitor,
@@ -526,6 +529,16 @@ void StatsLogProcessor::WriteDataToDiskLocked(const ConfigKey& key, 


void StatsLogProcessor::WriteDataToDiskLocked(const DumpReportReason dumpReportReason) {

    const int64_t timeNs = getElapsedRealtimeNs();

    // Do not write to disk if we already have in the last few seconds.

    // This is to avoid overwriting files that would have the same name if we

    //   write twice in the same second.

    if (static_cast<unsigned long long> (timeNs) <

            mLastWriteTimeNs + WRITE_DATA_COOL_DOWN_SEC * NS_PER_SEC) {

        ALOGI("Statsd skipping writing data to disk. Already wrote data in last %d seconds",

                WRITE_DATA_COOL_DOWN_SEC);

        return;

    }

    mLastWriteTimeNs = timeNs;

    for (auto& pair : mMetricsManagers) {

        WriteDataToDiskLocked(pair.first, timeNs, dumpReportReason);

    }

cmds/statsd/src/StatsLogProcessor.h

+3 −0
Original line number Diff line number Diff line
@@ -184,6 +184,9 @@ private: 


    long mLastPullerCacheClearTimeSec = 0;



    // Last time we wrote data to disk.

    int64_t mLastWriteTimeNs = 0;



#ifdef VERY_VERBOSE_PRINTING

    bool mPrintAllLogs = false;

#endif

core/java/android/app/IActivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ interface IActivityManager { 
    oneway void activityIdle(in IBinder token, in Configuration config,

            in boolean stopProfiling);

    void activityPaused(in IBinder token);

    oneway void activityStopped(in IBinder token, in Bundle state,

    void activityStopped(in IBinder token, in Bundle state,

            in PersistableBundle persistentState, in CharSequence description);

    String getCallingPackage(in IBinder token);

    ComponentName getCallingActivity(in IBinder token);

core/java/android/util/FeatureFlagUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class FeatureFlagUtils { 
        DEFAULT_FLAGS.put("settings_data_usage_v2", "true");

        DEFAULT_FLAGS.put("settings_audio_switcher", "true");

        DEFAULT_FLAGS.put("settings_systemui_theme", "true");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "true");

        DEFAULT_FLAGS.put(HEARING_AID_SETTINGS, "false");

    }



    /**

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ 
    <protected-broadcast android:name="android.telecom.action.DEFAULT_DIALER_CHANGED" />

    <protected-broadcast android:name="android.provider.action.DEFAULT_SMS_PACKAGE_CHANGED" />

    <protected-broadcast android:name="android.provider.action.SMS_MMS_DB_CREATED" />

    <protected-broadcast android:name="android.provider.action.SMS_MMS_DB_LOST" />

    <protected-broadcast android:name="android.intent.action.CONTENT_CHANGED" />

    <protected-broadcast android:name="android.provider.Telephony.MMS_DOWNLOADED" />