diff options
| author | rmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 22:53:48 +0000 |
|---|---|---|
| committer | rmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-17 22:53:48 +0000 |
| commit | 86deb356a009b3e68b6495fdab4f0c18e0f17de1 (patch) | |
| tree | 540f64abfb77e1effc39d68b360c3aa361670ee7 /base | |
| parent | 51448fc594822bd75b049968fed067a665c761ee (diff) | |
| download | chromium_src-86deb356a009b3e68b6495fdab4f0c18e0f17de1.zip chromium_src-86deb356a009b3e68b6495fdab4f0c18e0f17de1.tar.gz chromium_src-86deb356a009b3e68b6495fdab4f0c18e0f17de1.tar.bz2 | |
[Android] Make TRIM_MEMORY_COMPLETE check >= rather than ==
BUG=None
Review URL: https://chromiumcodereview.appspot.com/22911017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/java/src/org/chromium/base/MemoryPressureListener.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/android/java/src/org/chromium/base/MemoryPressureListener.java b/base/android/java/src/org/chromium/base/MemoryPressureListener.java index 311b0f6..5d2598a 100644 --- a/base/android/java/src/org/chromium/base/MemoryPressureListener.java +++ b/base/android/java/src/org/chromium/base/MemoryPressureListener.java @@ -12,7 +12,7 @@ import android.content.res.Configuration; /** * This is an internal implementation of the C++ counterpart. * It registers a ComponentCallbacks2 with the system, and dispatches into - * native. + * native for levels that are considered actionable. */ public class MemoryPressureListener { @CalledByNative @@ -43,10 +43,12 @@ public class MemoryPressureListener { } private static void maybeNotifyMemoryPresure(int level) { - if (level == ComponentCallbacks2.TRIM_MEMORY_COMPLETE) { + if (level >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) { nativeOnMemoryPressure(MemoryPressureLevelList.MEMORY_PRESSURE_CRITICAL); } else if (level >= ComponentCallbacks2.TRIM_MEMORY_BACKGROUND || level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_CRITICAL) { + // Don't notifiy on TRIM_MEMORY_UI_HIDDEN, since this class only + // dispatches actionable memory pressure signals to native. nativeOnMemoryPressure(MemoryPressureLevelList.MEMORY_PRESSURE_MODERATE); } } |