summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-05-02 13:21:16 -0700
committerDianne Hackborn <hackbod@google.com>2014-05-02 13:21:16 -0700
commit5d84bce12204072bc7ab296ce0cdea7efb5cf17c (patch)
tree51c4c489f3536e5244918b65db41d1578483f585 /services
parent5b8b92002230525317d5832a84d7813467594967 (diff)
downloadframeworks_base-5d84bce12204072bc7ab296ce0cdea7efb5cf17c.zip
frameworks_base-5d84bce12204072bc7ab296ce0cdea7efb5cf17c.tar.gz
frameworks_base-5d84bce12204072bc7ab296ce0cdea7efb5cf17c.tar.bz2
Fix issue #14492403: Oom scores appear to be incorrect...
...and causing runtime restarts Got a little too aggressive with the delete key. *blush* Change-Id: Icd4637827424211abc2347f7f9407c2d4c95cfad
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 042bf5f..bcc6359 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15186,8 +15186,8 @@ public final class ActivityManagerService extends ActivityManagerNative
// it when computing the final cached adj later. Note that we don't need to
// worry about this for max adj above, since max adj will always be used to
// keep it out of the cached vaues.
- adj = app.modifyRawOomAdj(adj);
-
+ app.curAdj = app.modifyRawOomAdj(adj);
+ app.curSchedGroup = schedGroup;
app.curProcState = procState;
app.foregroundActivities = foregroundActivities;