diff options
| author | Wale Ogunwale <ogunwale@google.com> | 2014-11-04 19:14:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-04 19:14:49 +0000 |
| commit | 2749a5e6cec41cbdc019134db6fc96e5283db9b4 (patch) | |
| tree | 04e736f15c15de6fd0378db851729623e34248b8 /tests | |
| parent | d9764f1c233a3106ce11c4c48fb93b020a1061d4 (diff) | |
| parent | e54553c841f3ca1ebcb822e8b9ab6a412e7bd895 (diff) | |
| download | frameworks_base-2749a5e6cec41cbdc019134db6fc96e5283db9b4.zip frameworks_base-2749a5e6cec41cbdc019134db6fc96e5283db9b4.tar.gz frameworks_base-2749a5e6cec41cbdc019134db6fc96e5283db9b4.tar.bz2 | |
am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks.
* commit 'e54553c841f3ca1ebcb822e8b9ab6a412e7bd895':
Fix issue #17305377: Don't kill process if it still has tasks.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java index 6837d22..94874c8 100644 --- a/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java +++ b/tests/ActivityTests/src/com/google/android/test/activity/ActivityTestMain.java @@ -127,7 +127,7 @@ public class ActivityTestMain extends Activity { @Override public boolean onLongClick(View v) { if (task.id >= 0 && thumbs != null) { - mAm.removeTask(task.id, ActivityManager.REMOVE_TASK_KILL_PROCESS); + mAm.removeTask(task.id); buildUi(); return true; } |