base/android/java/src/org/chromium/base/MemoryPressureListener.java - Issue 754433003: Update from https://crrev.com/305340

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/java/src/org/chromium/base/MemoryPressureListener.java

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « base/android/java/src/org/chromium/base/LocaleUtils.java ('k') | base/android/java/src/org/chromium/base/ObserverList.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 28d9651c2e3d663156a0e8e4b6344881f938692d..e7c2030a8f777d98d3cae8d041de0125dd0293b2 100644

--- a/base/android/java/src/org/chromium/base/MemoryPressureListener.java

+++ b/base/android/java/src/org/chromium/base/MemoryPressureListener.java

@@ -86,8 +86,8 @@ public class MemoryPressureListener {

public static void maybeNotifyMemoryPresure(int level) {

if (level >= ComponentCallbacks2.TRIM_MEMORY_COMPLETE) {

nativeOnMemoryPressure(MemoryPressureLevel.CRITICAL);

- } else if (level >= ComponentCallbacks2.TRIM_MEMORY_BACKGROUND ||

- level == ComponentCallbacks2.TRIM_MEMORY_RUNNING_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(MemoryPressureLevel.MODERATE);