diff options
| author | Joey Grover <joeygrover@gmail.com> | 2018-10-23 17:28:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 17:28:32 -0400 |
| commit | dfa5ccd9dfac1d1d4f6a296a7ec16a498379e25c (patch) | |
| tree | dc20dba678a9e0033ed5aba659aed1aeeb586bee | |
| parent | 5deb3a39be7d52c0e2bb81122fcc64994871d4ff (diff) | |
| parent | ec5614d6e6afda004a2bac82367d35d3acab8cbc (diff) | |
| download | sdl_android-dfa5ccd9dfac1d1d4f6a296a7ec16a498379e25c.tar.gz | |
Merge pull request #909 from smartdevicelink/hotfix/fix_service_nullhotfix/4.7.1
Fix null issue in getService()
| -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)
|