diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-06-11 10:53:16 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-11 10:53:16 -0700 |
commit | 9f8cc518e14c7a34bc52da712afbf02d84585f67 (patch) | |
tree | 20132f8e7504a7f481fc31c89370bcbbc157c807 /core/java/android/app | |
parent | f5eafe40cd3f0890dd4ce98a63c8f95b786a3dd9 (diff) | |
parent | 32907cfb38bda2d3c052cf5139c5b592678fedbb (diff) | |
download | frameworks_base-9f8cc518e14c7a34bc52da712afbf02d84585f67.zip frameworks_base-9f8cc518e14c7a34bc52da712afbf02d84585f67.tar.gz frameworks_base-9f8cc518e14c7a34bc52da712afbf02d84585f67.tar.bz2 |
Merge "Adjust activity manager process OOM adj." into kraken
Diffstat (limited to 'core/java/android/app')
-rw-r--r-- | core/java/android/app/ActivityManager.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 793b9d2..7f95bf5 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -726,16 +726,24 @@ public class ActivityManager { public static final int IMPORTANCE_FOREGROUND = 100; /** - * Constant for {@link #importance}: this process is running a - * heavy-weight application and thus should not be killed. + * Constant for {@link #importance}: this process is running something + * that is actively visible to the user, though not in the immediate + * foreground. */ - public static final int IMPORTANCE_HEAVY_WEIGHT = 150; + public static final int IMPORTANCE_VISIBLE = 200; /** * Constant for {@link #importance}: this process is running something - * that is considered to be actively visible to the user. + * that is considered to be actively perceptible to the user. An + * example would be an application performing background music playback. */ - public static final int IMPORTANCE_VISIBLE = 200; + public static final int IMPORTANCE_PERCEPTIBLE = 130; + + /** + * Constant for {@link #importance}: this process is running a + * heavy-weight application and thus should not be killed. + */ + public static final int IMPORTANCE_HEAVY_WEIGHT = 170; /** * Constant for {@link #importance}: this process is contains services |