Skip to content

Prevent exceptions being thrown for remaining startForegroundService calls #1830

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

Merged
JulianKast merged 4 commits into from
Sep 14, 2022
Merged

Prevent exceptions being thrown for remaining startForegroundService calls #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b22c4cf
Change SdlBR handleStartServiceEx access modifier
joeygrover Sep 8, 2022
1cba744
Add try/catch to RS status class startFrgndService
joeygrover Sep 8, 2022
75acab4
Add try/catch to USB Activity startFrgndService
joeygrover Sep 8, 2022
c28b81b
Add missing space in SDLRSSProvider try block
joeygrover Sep 14, 2022
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
7 changes: 6 additions & 1 deletion android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,12 @@ private static boolean isBluetoothConnected() {
return false;
}

private static void handleStartServiceException(Exception e) {
/**
* Convenience method to log details on the specific exception that occurred while attempting to
* start a foreground service.
* @param e the exception that occurred
*/
protected static void handleStartServiceException(Exception e) {
if (e instanceof SecurityException) {
DebugTool.logError(TAG, "Security exception, process is bad");
return;
Expand Down
14 changes: 12 additions & 2 deletions android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterStatusProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,21 @@ private boolean bindToService() {
} else {
bindingIntent.putExtra(FOREGROUND_EXTRA, true);
SdlBroadcastReceiver.setForegroundExceptionHandler(); //Prevent ANR in case the OS takes too long to start the service
context.startForegroundService(bindingIntent);
try {
context.startForegroundService(bindingIntent);
} catch (SecurityException | IllegalStateException e) {
SdlBroadcastReceiver.handleStartServiceException(e);
}

}
bindingIntent.setAction(TransportConstants.BIND_REQUEST_TYPE_STATUS);
return context.bindService(bindingIntent, routerConnection, Context.BIND_AUTO_CREATE);
boolean didBind = false;
try {
didBind = context.bindService(bindingIntent, routerConnection, Context.BIND_AUTO_CREATE);
} catch (SecurityException | IllegalStateException e) {
SdlBroadcastReceiver.handleStartServiceException(e);
}
return didBind;
}

private void unBindFromService() {
Expand Down
4 changes: 2 additions & 2 deletions ...l_android/src/main/java/com/smartdevicelink/transport/USBAccessoryAttachmentActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ public void onUsbTransferUpdate(boolean success) {

}

} catch (SecurityException e) {
DebugTool.logError(TAG, "Security exception, process is bad");
} catch (SecurityException | IllegalStateException e) {
SdlBroadcastReceiver.handleStartServiceException(e);
}
} else {
if (usbAccessory != null) {
Expand Down