Merge pull request #85 from google/useintent

app: run test from an Intent

Author: philburk

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.sonodroid.synthmark"
         minSdkVersion 26
         targetSdkVersion 26
-        versionCode 6
-        versionName "1.6"
+        versionCode 7
+        versionName "1.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

android/app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="com.sonodroid.synthmark">
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:name=".AppObject"
@@ -11,7 +12,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:launchMode="singleTask" android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

android/app/src/main/java/com/sonodroid/synthmark/AppObject.java

@@ -36,7 +36,7 @@
 public class AppObject extends Application {
     public final static String TAG = "SynthMark";
 
-    private final static int PROGRESS_REFRESH_RATE_MS = 300;
+    private final static int PROGRESS_REFRESH_RATE_MS = 200;
     private final static int PROGRESS_WARM_UP_WAIT = 300;
 
     private final static int NATIVETEST_STATUS_RUNNING = 2; //from NativeTest.h
@@ -212,6 +212,10 @@ List getParamsForTest(int testId) {
         return paramList;
     }
 
+    List<Param> getParamsForTest() {
+        return getParamsForTest(getCurrentTestId());
+    }
+
     @Override
     protected void finalize() throws Throwable {
         testClose(mNativeTest);
@@ -263,8 +267,11 @@ public static String getDeviceInfo(){
             info.append("\n");
         }
 
-        String boostInfo = readFile(SCHEDTUNE_BOOST_FILE_NAME);
-        info.append("schedtune.boost: " + boostInfo.trim() + "\n");
+        String boostInfo = readFile(SCHEDTUNE_BOOST_FILE_NAME).trim();
+        if (boostInfo.length() == 0) {
+            boostInfo = "----";
+        }
+        info.append("schedtune.boost: " + boostInfo + "\n");
 
         return info.toString();
     }
@@ -320,17 +327,20 @@ protected String doInBackground(String... params) {
             while (running) {
                 if (mNativeTest != 0) {
                     updateProgressBar();
-                    updateOutputReport();
 
                     int status = testStatus(mNativeTest);
                     if (status != NATIVETEST_STATUS_RUNNING) {
                         running = false;
                     }
+
                     try {
                         Thread.sleep(PROGRESS_REFRESH_RATE_MS);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
+
+
+                    updateOutputReport();
                 } else {
                     break;
                 }
@@ -358,6 +368,7 @@ private void updateOutputReport() {
         protected void onPostExecute(String result) {
             log("TestProgressTask.onPostExecute result: " + result);
             postNotificationTestShortUpdate(mTestId, result);
+            postNotificationTestCompleted(mTestId);
         }
     }
 
@@ -373,16 +384,15 @@ protected String doInBackground(String... params) {
             log("Started running test... ["+mTestId +"]");
             testInit(mNativeTest, mTestId);
 
-            postNotificationTestUpdate(mTestId, "Test inited");
+            postNotificationTestUpdate(mTestId, "Test initialized\n");
             testRun(mNativeTest);
             setRunning(false);
 
             return "done"; // gets passed to onPostExecute()
         }
 
         protected void onPostExecute(String result) {
-            log("TestTack.onPostExecute result: " + result);
-            postNotificationTestCompleted(mTestId);
+            log("TestTask.onPostExecute result: " + result);
             setRunning(false);
         }
     }
@@ -425,7 +435,8 @@ public void postNotificationTestStarted(int testId) {
     }
 
     public void postNotificationTestUpdate(int testId, String message) {
-        log("test update");
+        int end = Math.min(message.length(), 40);
+        log("Post test update: #" + message.length() + ", " + message.substring(0, end));
         Intent intent = new Intent(AppObject.INTENT_NOTIFICATION);
         intent.putExtra(INTENT_NOTIFICATION_TYPE, NOTIFICATION_TEST_UPDATE);
         intent.putExtra(NOTIFICATION_KEY_TEST_ID, testId);
@@ -434,7 +445,7 @@ public void postNotificationTestUpdate(int testId, String message) {
     }
 
     public void postNotificationTestCompleted(int testId) {
-        log("Test ended");
+        log("Post test completed");
         Intent intent = new Intent(AppObject.INTENT_NOTIFICATION);
         intent.putExtra(INTENT_NOTIFICATION_TYPE, NOTIFICATION_TEST_COMPLETED);
         intent.putExtra(NOTIFICATION_KEY_TEST_ID, testId);

android/app/src/main/java/com/sonodroid/synthmark/BaseActivity.java

@@ -40,12 +40,14 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onPause() {
         super.onPause();
+        log("onPause() UNregister Broadcast receiver for notification");
         LocalBroadcastManager.getInstance(this).unregisterReceiver(mReceiver);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        log("onResume() Register Broadcast receiver for notification");
         LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver,
                 new IntentFilter(AppObject.INTENT_NOTIFICATION));
     }
@@ -73,26 +75,26 @@ public void setViewEnable(View v, boolean enable) {
     }
 
     public void notificationTestStarted(int testId) {
-        log("notificationTestStarted " + testId);
-
+        log("notificationTestStarted(" + testId + ")");
     }
 
     public void notificationTestUpdate(int testId, String message) {
-        log("notificationTestUpdate " + testId + " m: " + message);
+        log("notificationTestUpdate(" + testId + ",...)");
     }
 
     public void notificationTestCompleted(int testId) {
-        log("notificationTestCompleted " + testId);
+        log("notificationTestCompleted(" + testId + ")");
     }
 
     public void notificationTestShortUpdate(int testId, String message) {
-        log("notificationTestShortUpdate " + testId + " m: " + message);
+        // log("notificationTestShortUpdate(" + testId + ", " + message + ")");
     }
 
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             int type = intent.getIntExtra(AppObject.INTENT_NOTIFICATION_TYPE, -1);
+            log("BroadcastReceiver: type = " + type);
 
             switch(type) {
                 case AppObject.NOTIFICATION_TEST_STARTED: {