summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-31 19:07:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-31 19:07:03 -0700
commitc3895253bb833611df8c8f62347ede70153eb5b9 (patch)
tree7f01a207bb557acbc504cb7173238af678831ca5 /core/java/android
parentdb50f4eb0fda527778a0763b1a36f9ee4b4f4db2 (diff)
parentd53710ce644e7f1df417a8fe42ec26233a751b2e (diff)
downloadframeworks_base-c3895253bb833611df8c8f62347ede70153eb5b9.zip
frameworks_base-c3895253bb833611df8c8f62347ede70153eb5b9.tar.gz
frameworks_base-c3895253bb833611df8c8f62347ede70153eb5b9.tar.bz2
am d53710ce: Merge "Extend process observer to be usable for media routing." into jb-dev
* commit 'd53710ce644e7f1df417a8fe42ec26233a751b2e': Extend process observer to be usable for media routing.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/ActivityManager.java7
-rw-r--r--core/java/android/app/IProcessObserver.aidl1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java
index 17b1962..92b6f72 100644
--- a/core/java/android/app/ActivityManager.java
+++ b/core/java/android/app/ActivityManager.java
@@ -1360,6 +1360,13 @@ public class ActivityManager {
public int lastTrimLevel;
/**
+ * Constant for {@link #importance}: this is a persistent process.
+ * Only used when reporting to process observers.
+ * @hide
+ */
+ public static final int IMPORTANCE_PERSISTENT = 50;
+
+ /**
* Constant for {@link #importance}: this process is running the
* foreground UI.
*/
diff --git a/core/java/android/app/IProcessObserver.aidl b/core/java/android/app/IProcessObserver.aidl
index 2094294..e587912 100644
--- a/core/java/android/app/IProcessObserver.aidl
+++ b/core/java/android/app/IProcessObserver.aidl
@@ -20,6 +20,7 @@ package android.app;
oneway interface IProcessObserver {
void onForegroundActivitiesChanged(int pid, int uid, boolean foregroundActivities);
+ void onImportanceChanged(int pid, int uid, int importance);
void onProcessDied(int pid, int uid);
}