| Index: base/android/java/src/org/chromium/base/MemoryPressureListener.java
|
| diff --git a/base/android/java/src/org/chromium/base/MemoryPressureListener.java b/base/android/java/src/org/chromium/base/MemoryPressureListener.java
|
| index e6d2dfa673ca18cfbfaafb356ba4ea740b0600d1..311b0f6ff49a68102dec6ae273ae3cd929267a81 100644
|
| --- a/base/android/java/src/org/chromium/base/MemoryPressureListener.java
|
| +++ b/base/android/java/src/org/chromium/base/MemoryPressureListener.java
|
| @@ -8,8 +8,6 @@ import android.content.ComponentCallbacks2;
|
| import android.content.Context;
|
| import android.content.res.Configuration;
|
|
|
| -import org.chromium.base.MemoryPressureLevelList;
|
| -
|
|
|
| /**
|
| * This is an internal implementation of the C++ counterpart.
|
| @@ -23,7 +21,7 @@ public class MemoryPressureListener {
|
| new ComponentCallbacks2() {
|
| @Override
|
| public void onTrimMemory(int level) {
|
| - nativeOnMemoryPressure(translate(level));
|
| + maybeNotifyMemoryPresure(level);
|
| }
|
|
|
| @Override
|
| @@ -41,14 +39,16 @@ public class MemoryPressureListener {
|
| * Used by applications to simulate a memory pressure signal.
|
| */
|
| public static void simulateMemoryPressureSignal(int level) {
|
| - nativeOnMemoryPressure(translate(level));
|
| + maybeNotifyMemoryPresure(level);
|
| }
|
|
|
| - private static int translate(int level) {
|
| + private static void maybeNotifyMemoryPresure(int level) {
|
| if (level == ComponentCallbacks2.TRIM_MEMORY_COMPLETE) {
|
| - return MemoryPressureLevelList.MEMORY_PRESSURE_CRITICAL;
|
| + nativeOnMemoryPressure(MemoryPressureLevelList.MEMORY_PRESSURE_CRITICAL);
|
| + } else if (level >= ComponentCallbacks2.TRIM_MEMORY_BACKGROUND ||
|
| + level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL) {
|
| + nativeOnMemoryPressure(MemoryPressureLevelList.MEMORY_PRESSURE_MODERATE);
|
| }
|
| - return MemoryPressureLevelList.MEMORY_PRESSURE_MODERATE;
|
| }
|
|
|
| private static native void nativeOnMemoryPressure(int memoryPressureType);
|
|
|