PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential OOM problem

Browse Source 
Prior to this cl, there's a potential vulnerability to
cache huge logging data in the memory.
We send the log out when user didn't trigger any event
in 1 min. However, if user keep triggering any log
event in 1 min, then there's a change to preserve a huge
number logs in the device memory. Then, it causes the OOM.

The solution is to set a logging threshold, once the current
logging number is larger than 150, then we simply send it
out immediately and clean the device memory.

Test: Log can be sent out after meeting the threshold.
Fix: 211323528
Change-Id: I9d507e8d55d6b7f7e682369edf3b5334eb2856ae
This commit is contained in:
Tsung-Mao Fang
2021-12-24 11:01:30 +08:00
parent ce1f8fdb08
commit 72f823ba9e
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/core/instrumentation/SettingsIntelligenceLogWriter.java
View File

@@ -48,6 +48,8 @@ public class SettingsIntelligenceLogWriter implements LogWriter {
private static final String LOG = "logs"; private static final String LOG = "logs";
private static final long MESSAGE_DELAY = DateUtils.MINUTE_IN_MILLIS; // 1 minute private static final long MESSAGE_DELAY = DateUtils.MINUTE_IN_MILLIS; // 1 minute
// Based on the exp, 99.5% users collect less than 150 data in 1 minute.
private static final int CACHE_LOG_THRESHOLD = 150;
private List<SettingsLog> mSettingsLogList; private List<SettingsLog> mSettingsLogList;
private SendLogHandler mLogHandler; private SendLogHandler mLogHandler;
@@ -128,7 +130,8 @@ public class SettingsIntelligenceLogWriter implements LogWriter {
mLogHandler.post(() -> { mLogHandler.post(() -> {
mSettingsLogList.add(settingsLog); mSettingsLogList.add(settingsLog);
}); });
if (action == SettingsEnums.ACTION_CONTEXTUAL_CARD_DISMISS) { if (action == SettingsEnums.ACTION_CONTEXTUAL_CARD_DISMISS
|| mSettingsLogList.size() >= CACHE_LOG_THRESHOLD) {
// Directly send this event to notify SI instantly that the card is dismissed // Directly send this event to notify SI instantly that the card is dismissed
mLogHandler.sendLog(); mLogHandler.sendLog();
} else { } else {