diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-06-26 23:16:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-26 23:16:48 +0000 |
| commit | 49e9c44c4bf1e7ab52ffedc904cff86adea7e9ed (patch) | |
| tree | 7e48935513da1f5b1cbb9ed4dd14a7b973f37fd4 /services | |
| parent | 89dc02a9bed818cc6f5296c97eb504ccb010db42 (diff) | |
| parent | b4e12494935697fa4ede006b37e6be889ef27109 (diff) | |
| download | frameworks_base-49e9c44c4bf1e7ab52ffedc904cff86adea7e9ed.zip frameworks_base-49e9c44c4bf1e7ab52ffedc904cff86adea7e9ed.tar.gz frameworks_base-49e9c44c4bf1e7ab52ffedc904cff86adea7e9ed.tar.bz2 | |
Merge "Add new ActivityManager.isLowRamDevice()."
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/am/ProcessTracker.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/content/SyncManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/am/ProcessTracker.java b/services/java/com/android/server/am/ProcessTracker.java index c9db7e5..30470f1 100644 --- a/services/java/com/android/server/am/ProcessTracker.java +++ b/services/java/com/android/server/am/ProcessTracker.java @@ -850,7 +850,7 @@ public final class ProcessTracker { pw.print(prefix); pw.print("PSS ("); pw.print(proc.mPssTableSize); - pw.println(" entrues):"); + pw.println(" entries):"); printedHeader = true; } pw.print(prefix); diff --git a/services/java/com/android/server/content/SyncManager.java b/services/java/com/android/server/content/SyncManager.java index 25df50a..9e2e841 100644 --- a/services/java/com/android/server/content/SyncManager.java +++ b/services/java/com/android/server/content/SyncManager.java @@ -113,7 +113,7 @@ public class SyncManager { private static final long MAX_TIME_PER_SYNC; static { - final boolean isLargeRAM = ActivityManager.isLargeRAM(); + final boolean isLargeRAM = !ActivityManager.isLowRamDeviceStatic(); int defaultMaxInitSyncs = isLargeRAM ? 5 : 2; int defaultMaxRegularSyncs = isLargeRAM ? 2 : 1; MAX_SIMULTANEOUS_INITIALIZATION_SYNCS = |