diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-22 14:35:09 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-10-22 14:35:09 -0700 |
| commit | e6634981f12e1d218eaf61c6488af3d8c9f0d202 (patch) | |
| tree | 74c9a3ba82b2584d30da2e44a7f2d15916d415c4 /services/java | |
| parent | 2351e69a13e8b9372cc4a33d28c1fd230f51faa3 (diff) | |
| parent | 9c7489f8bdcd08990c44250cbad64399badc72be (diff) | |
| download | frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.zip frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.tar.gz frameworks_base-e6634981f12e1d218eaf61c6488af3d8c9f0d202.tar.bz2 | |
resolved conflicts for merge of 9c7489f8 to master
Change-Id: I1d8fd1146925f48ad690c89230d24dc8694703f4
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 54a7aa1..de2e965 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -7152,7 +7152,7 @@ public final class ActivityManagerService extends ActivityManagerNative } else if (adj >= SECONDARY_SERVER_ADJ) { currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE; } else if (adj >= HEAVY_WEIGHT_APP_ADJ) { - currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_HEAVY_WEIGHT; + currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE; } else if (adj >= PERCEPTIBLE_APP_ADJ) { currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE; } else if (adj >= VISIBLE_APP_ADJ) { |