From 8163cc5ad7fd9a7a28db3c1ac1632701353d2449 Mon Sep 17 00:00:00 2001
From: HappyZ <zhuyanzi@gmail.com>
Date: Sat, 25 Feb 2017 10:00:46 -0800
Subject: [PATCH] bug fix

---
 .../sandlab/offloadingdemo/MainActivity.java  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/MainActivity.java b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/MainActivity.java
index 8c0c753..0d027dc 100755
--- a/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/MainActivity.java
+++ b/OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/MainActivity.java
@@ -670,9 +670,14 @@ class MainActivity extends Activity {
                                 txt_results.append("Starting.. will come back after 1min\n");
                             }
                         });
-                        // disable tcpdump
-                        boolean isUsingTCPDump_backup = isUsingTCPDump;
-                        isUsingTCPDump = false;
+//                        // disable tcpdump
+//                        boolean isUsingTCPDump_backup = isUsingTCPDump;
+//                        isUsingTCPDump = false;
+                        String[] commd = new String[3];
+                        commd[0] = "su";
+                        commd[1] = "&&";
+                        commd[2] = "cd " + outFolderPath
+                                + " && rm *.cpu *.cpuRaw *.ss tcpdump*";
                         // change screen brightness to 0
                         Utilities.switchScreenStatus();
 
@@ -700,18 +705,22 @@ class MainActivity extends Activity {
                                 "yyyyMMdd_HHmmss", Locale.US)
                                 .format(new Date()))
                                 + ".tar.gz";
-                        String[] commd = new String[3];
-                        commd[0] = "su";
-                        commd[1] = "&&";
                         commd[2] = "cd " + outFolderPath
                                 + " && busybox tar -czf "
-                                + tarName + " *.cpu *.cpuRaw *.ss";
+                                + tarName + " *.cpu *.cpuRaw *.ss tcpdump*";
                         try {
                             Runtime.getRuntime().exec(commd).waitFor();
                         } catch (InterruptedException | IOException e) {
                             e.printStackTrace();
                         }
-                        isUsingTCPDump = isUsingTCPDump_backup;
+                        commd[2] = "cd " + outFolderPath
+                                + " && rm *.cpu *.cpuRaw *.ss tcpdump*";
+                        try {
+                            Runtime.getRuntime().exec(commd).waitFor();
+                        } catch (InterruptedException | IOException e) {
+                            e.printStackTrace();
+                        }
+//                        isUsingTCPDump = isUsingTCPDump_backup;
                         // msg indicating all done
                         myHandler.post(new Runnable() {
                             @Override