diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-11-21 21:48:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-21 21:48:47 +0000 |
| commit | 682ed6b60807d5fa971dbd6c76deae788cb65df4 (patch) | |
| tree | 0d58825018b2d36d1f12238f8f3ce80c936d2c5a /core/java/android/app/ActivityManagerInternal.java | |
| parent | 2dafe6664a7dd6d9aa227b0779a90891c2b1b2ef (diff) | |
| parent | 9ef94019386183cb88ad090965418ef294bbb79a (diff) | |
Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-dev
Diffstat (limited to 'core/java/android/app/ActivityManagerInternal.java')
| -rw-r--r-- | core/java/android/app/ActivityManagerInternal.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java index 2a17fa6a8a26..d56dc1e07f52 100644 --- a/core/java/android/app/ActivityManagerInternal.java +++ b/core/java/android/app/ActivityManagerInternal.java @@ -23,8 +23,8 @@ package android.app; */ public abstract class ActivityManagerInternal { // Called by the power manager. - public abstract void goingToSleep(); - public abstract void wakingUp(); + public abstract void onWakefulnessChanged(int wakefulness); + public abstract int startIsolatedProcess(String entryPoint, String[] mainArgs, String processName, String abiOverride, int uid, Runnable crashHandler); } |