diff options
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 2bdf94762..79284c302 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -1048,28 +1048,19 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> private Service getService()
{
- Service myService = null;
- if (_proxyListener != null && _proxyListener instanceof Service)
- {
- myService = (Service) _proxyListener;
- }
- else if (_appService != null)
- {
- myService = _appService;
- }
- if (myService != null)
- {
- try
- {
- return myService;
- }
- catch(Exception ex)
- {
- return null;
+ try {
+ Service myService = null;
+ if (_proxyListener != null && _proxyListener instanceof Service) {
+ myService = (Service) _proxyListener;
+ } else if (_appService != null) {
+ myService = _appService;
+ } else if (_appContext != null && _appContext instanceof Service) {
+ myService = (Service) _appContext;
}
-
+ return myService;
+ } catch (Exception ex){
+ return null;
}
- return null;
}
private void sendBroadcastIntent(Intent sendIntent)
|