Skip to content

Cherry pick PR #8527: Implement StarboardBridge.java::requestStop() #10040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cobalt-github-releaser-bot wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −2
Draft

Cherry pick PR #8527: Implement StarboardBridge.java::requestStop() #10040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cobalt/android/apk/app/src/main/java/dev/cobalt/coat/StarboardBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,12 @@ protected void onActivityDestroy(Activity activity) {
Log.i(TAG, "Activity destroyed after shutdown; killing app.");
StarboardBridgeJni.get().closeNativeStarboard(mNativeApp);
closeAllServices();
<<<<<<< HEAD
mAdvertisingId.shutdown();
System.exit(0);
=======
activity.finishAndRemoveTask();
>>>>>>> 64bf60ac07 (Implement StarboardBridge.java::requestStop() (#8527))
} else {
Log.i(TAG, "Activity destroyed without shutdown; app suspended in background.");
}
Expand Down Expand Up @@ -284,8 +288,10 @@ public void requestSuspend() {
}
}

// TODO(cobalt): remove when Kimono fully switches to Chrobalt.
public void requestStop(int errorLevel) {}
/* Immediate shutdown, used at least by StandalonePlayerActivity. */
public void requestStop(int errorLevel) {
activity.finishAndRemoveTask();
}

public boolean onSearchRequested() {
return false;
Expand Down
Loading