diff options
author | 2018-12-04 16:40:27 +0000 | |
---|---|---|
committer | 2018-12-04 16:40:27 +0000 | |
commit | 5b9de38cd13a2df97733cb6e49d656e88e9964c8 (patch) | |
tree | abfebcedda182f061734442c96a0cd83a6585a11 | |
parent | 2fcf06a23bc87f94b42ccbedc7e37fa82d2d7bd3 (diff) | |
parent | 25f2eacaf923ed604414a5dae27d8c0818d21387 (diff) |
Merge "Activity manager: native callback for process state"
-rw-r--r-- | core/java/android/app/IActivityManager.aidl | 3 | ||||
-rw-r--r-- | core/java/android/app/IUidObserver.aidl | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl index e83bcd0e6647..88fb025bf406 100644 --- a/core/java/android/app/IActivityManager.aidl +++ b/core/java/android/app/IActivityManager.aidl @@ -96,6 +96,7 @@ interface IActivityManager { String callingPackage); void unregisterUidObserver(in IUidObserver observer); boolean isUidActive(int uid, String callingPackage); + int getUidProcessState(int uid, in String callingPackage); // =============== End of transactions used on native side as well ============================ // Special low-level communication with activity manager. @@ -379,8 +380,6 @@ interface IActivityManager { void noteAlarmFinish(in IIntentSender sender, in WorkSource workSource, int sourceUid, in String tag); int getPackageProcessState(in String packageName, in String callingPackage); void updateDeviceOwner(in String packageName); - int getUidProcessState(int uid, in String callingPackage); - // Start of N transactions // Start Binder transaction tracking for all applications. diff --git a/core/java/android/app/IUidObserver.aidl b/core/java/android/app/IUidObserver.aidl index ce8880940c78..e116d989ca75 100644 --- a/core/java/android/app/IUidObserver.aidl +++ b/core/java/android/app/IUidObserver.aidl @@ -43,8 +43,6 @@ oneway interface IUidObserver { */ void onUidIdle(int uid, boolean disabled); - // =============== End of transactions used on native side as well ============================ - /** * General report of a state change of an uid. * @@ -55,6 +53,8 @@ oneway interface IUidObserver { */ void onUidStateChanged(int uid, int procState, long procStateSeq); + // =============== End of transactions used on native side as well ============================ + /** * Report when the cached state of a uid has changed. * If true, a uid has become cached -- that is, it has some active processes that are |