Remove MediaPlaybackService (youtube#3324)

b/342254474 b/282813379 Change-Id: I4ae8c67b51d3fb7ef1efc8dce8600af2300824d5 Co-authored-by: Colin Liang <[email protected]>
briantting · May 29, 2024 · 05cfe09 · 05cfe09
1 parent 93959ea
commit 05cfe09
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 229 deletions.
diff --git a/starboard/android/apk/apk_sources.gni b/starboard/android/apk/apk_sources.gni
@@ -30,7 +30,6 @@ apk_sources = [
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CobaltTextToSpeechHelper.java",
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/CrashContextUpdateHandler.java",
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/ErrorDialog.java",
-  "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/MediaPlaybackService.java",
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/NetworkStatus.java",
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/NullCobaltFactory.java",
   "//starboard/android/apk/app/src/main/java/dev/cobalt/coat/PlatformError.java",

diff --git a/starboard/android/apk/app/src/app/AndroidManifest.xml b/starboard/android/apk/app/src/app/AndroidManifest.xml
@@ -72,11 +72,6 @@
       </intent-filter>
     </activity>
 
-    <service android:name="dev.cobalt.coat.MediaPlaybackService"
-      android:enabled="true"
-      android:exported="false"
-      android:foregroundServiceType="mediaPlayback"/>
-
   </application>
 
   <queries>

diff --git a/starboard/android/apk/app/src/main/java/dev/cobalt/coat/MediaPlaybackService.java b/starboard/android/apk/app/src/main/java/dev/cobalt/coat/MediaPlaybackService.java
diff --git a/starboard/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java b/starboard/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java
@@ -31,7 +31,6 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.os.Build;
-import android.os.Build.VERSION;
 import android.util.Pair;
 import android.util.Size;
 import android.util.SizeF;
@@ -184,48 +183,6 @@ protected void onServiceDestroy(Service service) {
     }
   }
 
-  @SuppressWarnings("unused")
-  @UsedByNative
-  protected void startMediaPlaybackService() {
-    if (cobaltMediaSession == null || !cobaltMediaSession.isActive()) {
-      Log.w(TAG, "Do not start a MediaPlaybackService when the MediSsession is null or inactive.");
-      return;
-    }
-
-    Service service = serviceHolder.get();
-    if (service == null) {
-      if (appContext == null) {
-        Log.w(TAG, "Activiy already destroyed.");
-        return;
-      }
-      Log.i(TAG, "Cold start - Instantiating a MediaPlaybackService.");
-      Intent intent = new Intent(appContext, MediaPlaybackService.class);
-      try {
-        if (VERSION.SDK_INT >= 26) {
-          appContext.startForegroundService(intent);
-        } else {
-          appContext.startService(intent);
-        }
-      } catch (SecurityException e) {
-        Log.e(TAG, "Failed to start MediaPlaybackService with intent.", e);
-        return;
-      }
-    } else {
-      Log.i(TAG, "Warm start - Restarting the MediaPlaybackService.");
-      ((MediaPlaybackService) service).startService();
-    }
-  }
-
-  @SuppressWarnings("unused")
-  @UsedByNative
-  protected void stopMediaPlaybackService() {
-    Service service = serviceHolder.get();
-    if (service != null) {
-      Log.i(TAG, "Stopping the MediaPlaybackService.");
-      ((MediaPlaybackService) service).stopService();
-    }
-  }
-
   @SuppressWarnings("unused")
   @UsedByNative
   protected void beforeStartOrResume() {
@@ -253,9 +210,6 @@ protected void beforeSuspend() {
       for (CobaltService service : cobaltServices.values()) {
         service.beforeSuspend();
       }
-      // We need to stop MediaPlaybackService before suspending so that this foreground service
-      // would not prevent releasing activity's memory consumption.
-      stopMediaPlaybackService();
     } catch (Throwable e) {
       Log.i(TAG, "Caught exception in beforeSuspend: " + e.getMessage());
     }

diff --git a/starboard/android/shared/android_main.cc b/starboard/android/shared/android_main.cc
@@ -270,20 +270,12 @@ void OnStart(GameActivity* activity) {
 
 void OnResume(GameActivity* activity) {
   if (g_app_running.load()) {
-    // Stop the MediaPlaybackService if activity state transits from background
-    // to foreground. Note that the MediaPlaybackService may already have
-    // been stopped before Cobalt's lifecycle state transits from Concealed
-    // to Frozen.
-    ApplicationAndroid::Get()->StopMediaPlaybackService();
     ApplicationAndroid::Get()->SendAndroidCommand(AndroidCommand::kResume);
   }
 }
 
 void OnPause(GameActivity* activity) {
   if (g_app_running.load()) {
-    // Start the MediaPlaybackService before activity state transits from
-    // foreground to background.
-    ApplicationAndroid::Get()->StartMediaPlaybackService();
     ApplicationAndroid::Get()->SendAndroidCommand(AndroidCommand::kPause);
   }
 }

diff --git a/starboard/android/shared/application_android.cc b/starboard/android/shared/application_android.cc
@@ -257,16 +257,6 @@ void ApplicationAndroid::OnSuspend() {
   env->CallStarboardVoidMethodOrAbort("beforeSuspend", "()V");
 }
 
-void ApplicationAndroid::StartMediaPlaybackService() {
-  JniEnvExt* env = JniEnvExt::Get();
-  env->CallStarboardVoidMethodOrAbort("startMediaPlaybackService", "()V");
-}
-
-void ApplicationAndroid::StopMediaPlaybackService() {
-  JniEnvExt* env = JniEnvExt::Get();
-  env->CallStarboardVoidMethodOrAbort("stopMediaPlaybackService", "()V");
-}
-
 void ApplicationAndroid::ProcessAndroidCommand() {
   JniEnvExt* env = JniEnvExt::Get();
   AndroidCommand cmd;

diff --git a/starboard/android/shared/application_android.h b/starboard/android/shared/application_android.h
@@ -107,10 +107,6 @@ class ApplicationAndroid
   std::string GetOverlayedStringValue(const char* var_name);
   bool GetOverlayedBoolValue(const char* var_name);
 
-  // Methods to start/stop Media playback service.
-  void StartMediaPlaybackService();
-  void StopMediaPlaybackService();
-
  protected:
   // --- Application overrides ---
   void Initialize() override;