summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorWale Ogunwale <ogunwale@google.com>2014-11-04 19:22:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-04 19:22:25 +0000
commita9868fbd7bd22a4a7cd97026ed293f889f92cf31 (patch)
tree98d44526accdaceab0fcf26a44a47597ceaaba68 /tests
parentdaccecb263cad36b55dd84e25709d543ee887202 (diff)
parent2749a5e6cec41cbdc019134db6fc96e5283db9b4 (diff)
downloadframeworks_base-a9868fbd7bd22a4a7cd97026ed293f889f92cf31.zip
frameworks_base-a9868fbd7bd22a4a7cd97026ed293f889f92cf31.tar.gz
frameworks_base-a9868fbd7bd22a4a7cd97026ed293f889f92cf31.tar.bz2
am 2749a5e6: am e54553c8: am d54b578e: Fix issue #17305377: Don\'t kill process if it still has tasks.
* commit '2749a5e6cec41cbdc019134db6fc96e5283db9b4': 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.java2
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;
}