add an extra button for foreground service

google · Jul 11, 2024 · f16d139 · f16d139
1 parent 873637a
commit f16d139
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 7 deletions.
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/IntentBasedTestSupport.java
@@ -60,6 +60,7 @@ public class IntentBasedTestSupport {
     public static final String KEY_FILE_NAME = "file";
     public static final String KEY_BUFFER_BURSTS = "buffer_bursts";
     public static final String KEY_BACKGROUND = "background";
+    public static final String KEY_FOREGROUND_SERVICE = "foreground_service";
     public static final String KEY_VOLUME = "volume";
 
     public static final String KEY_VOLUME_TYPE = "volume_type";

diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
@@ -60,6 +60,7 @@ public class MainActivity extends BaseOboeTesterActivity {
     private Bundle mBundleFromIntent;
     private CheckBox mWorkaroundsCheckBox;
     private CheckBox mBackgroundCheckBox;
+    private CheckBox mForegroundServiceCheckBox;
     private static String mVersionText;
 
     @Override
@@ -111,6 +112,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
         NativeEngine.setWorkaroundsEnabled(false);
 
         mBackgroundCheckBox = (CheckBox) findViewById(R.id.boxEnableBackground);
+        mForegroundServiceCheckBox = (CheckBox) findViewById(R.id.boxEnableForegroundService);
 
         mBuildTextView = (TextView) findViewById(R.id.text_build_info);
         mBuildTextView.setText(Build.DISPLAY
@@ -149,16 +151,19 @@ private void processBundleFromIntent() {
         }
         Intent intent = getTestIntent(mBundleFromIntent);
         if (intent != null) {
-            setBackgroundFromIntent();
+            setTogglesFromIntent();
             startActivity(intent);
         }
         mBundleFromIntent = null;
     }
 
-    private void setBackgroundFromIntent() {
+    private void setTogglesFromIntent() {
         boolean backgroundEnabled = mBundleFromIntent.getBoolean(
                 IntentBasedTestSupport.KEY_BACKGROUND, false);
         TestAudioActivity.setBackgroundEnabled(backgroundEnabled);
+        boolean foregroundServiceEnabled = mBundleFromIntent.getBoolean(
+                IntentBasedTestSupport.KEY_FOREGROUND_SERVICE, false);
+        TestAudioActivity.setBackgroundEnabled(foregroundServiceEnabled);
     }
 
     private Intent getTestIntent(Bundle bundle) {
@@ -255,6 +260,7 @@ private void applyUserOptions() {
 
         NativeEngine.setWorkaroundsEnabled(mWorkaroundsCheckBox.isChecked());
         TestAudioActivity.setBackgroundEnabled(mBackgroundCheckBox.isChecked());
+        TestAudioActivity.setForegroundServiceEnabled(mForegroundServiceCheckBox.isChecked());
     }
 
     @Override

diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/TestAudioActivity.java
@@ -100,6 +100,7 @@ abstract class TestAudioActivity extends AppCompatActivity {
     private int mSampleRate;
     private int mSingleTestIndex = -1;
     private static boolean mBackgroundEnabled;
+    private static boolean mForegroundServiceEnabled;
 
     protected Bundle mBundleFromIntent;
     protected boolean mTestRunningByIntent;
@@ -186,6 +187,14 @@ public static boolean isBackgroundEnabled() {
         return mBackgroundEnabled;
     }
 
+    public static void setForegroundServiceEnabled(boolean enabled) {
+        mForegroundServiceEnabled = enabled;
+    }
+
+    public static boolean isForegroundServiceEnabled() {
+        return mForegroundServiceEnabled;
+    }
+
     public void onStreamClosed() {
     }
 
@@ -240,7 +249,9 @@ protected void onStart() {
         if (mCommunicationDeviceView != null) {
             mCommunicationDeviceView.onStart();
         }
-        enableForegroundService(true);
+        if (isForegroundServiceEnabled()) {
+            enableForegroundService(true);
+        }
     }
 
     protected void resetConfiguration() {
@@ -304,7 +315,9 @@ protected void onStop() {
         if (!isBackgroundEnabled()) {
             Log.i(TAG, "onStop() called so stop the test =========================");
             onStopTest();
-            enableForegroundService(false);
+            if (isForegroundServiceEnabled()) {
+                enableForegroundService(false);
+            }
         }
         if (mCommunicationDeviceView != null) {
             mCommunicationDeviceView.onStop();
@@ -317,7 +330,9 @@ protected void onDestroy() {
         if (isBackgroundEnabled()) {
             Log.i(TAG, "onDestroy() called so stop the test =========================");
             onStopTest();
-            enableForegroundService(false);
+            if (isForegroundServiceEnabled()) {
+                enableForegroundService(false);
+            }
         }
         mAudioState = AUDIO_STATE_CLOSED;
         super.onDestroy();

diff --git a/apps/OboeTester/app/src/main/res/layout/activity_main.xml b/apps/OboeTester/app/src/main/res/layout/activity_main.xml
@@ -203,13 +203,23 @@
         app:layout_constraintTop_toBottomOf="@+id/boxEnableWorkarounds" />
 
 
+    <CheckBox
+        android:id="@+id/boxEnableForegroundService"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:checked="false"
+        android:text="enable foreground service"
+        app:layout_constraintStart_toStartOf="@+id/boxEnableBackground"
+        app:layout_constraintTop_toBottomOf="@+id/boxEnableBackground" />
+
     <TextView
         android:id="@+id/textView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="Mode:"
         app:layout_constraintBaseline_toBaselineOf="@+id/spinnerAudioMode"
-        app:layout_constraintStart_toStartOf="@+id/boxEnableBackground" />
+        app:layout_constraintStart_toStartOf="@+id/boxEnableForegroundService" />
 
     <Spinner
         android:id="@+id/spinnerAudioMode"
@@ -218,7 +228,7 @@
         android:entries="@array/audio_modes"
         android:prompt="@string/audio_mode_prompt"
         app:layout_constraintStart_toEndOf="@+id/textView2"
-        app:layout_constraintTop_toBottomOf="@+id/boxEnableBackground" />
+        app:layout_constraintTop_toBottomOf="@+id/boxEnableForegroundService" />
 
     <TextView
         android:id="@+id/deviceView"