From 1fe85991e84843bd9c751617dbb82f98df5b65af Mon Sep 17 00:00:00 2001 From: YK Hung Date: Tue, 11 Jun 2024 14:49:40 +0000 Subject: [PATCH] Disable explicit gc method invocation in V Disable the gc() method explicit invocation due to the new policy in the android to avoid android.os.strictmode.ExplicitGcViolation Test: presubmit Fix: 345577704 Flag: EXEMPT strictmode fix Change-Id: I6ec7dac6735499c40a7ab6d135108e4c5013a4a4 --- .../settings/fuelgauge/batteryusage/DatabaseUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java index 5b28abb422f..0bb6286171c 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java @@ -66,10 +66,10 @@ import java.util.stream.Collectors; public final class DatabaseUtils { private static final String TAG = "DatabaseUtils"; private static final String SHARED_PREFS_FILE = "battery_usage_shared_prefs"; + private static final boolean EXPLICIT_CLEAR_MEMORY_ENABLED = false; /** Clear memory threshold for device booting phase. */ private static final long CLEAR_MEMORY_THRESHOLD_MS = Duration.ofMinutes(5).toMillis(); - private static final long CLEAR_MEMORY_DELAYED_MS = Duration.ofSeconds(2).toMillis(); private static final long INVALID_TIMESTAMP = 0L; @@ -975,7 +975,8 @@ public final class DatabaseUtils { } private static void clearMemory() { - if (SystemClock.uptimeMillis() > CLEAR_MEMORY_THRESHOLD_MS) { + if (!EXPLICIT_CLEAR_MEMORY_ENABLED + || SystemClock.uptimeMillis() > CLEAR_MEMORY_THRESHOLD_MS) { return; } final Handler mainHandler = new Handler(Looper.getMainLooper());