diff options
| author | Bilal <bilal@Bilals-MBP.localdomain> | 2018-09-07 13:59:39 -0400 |
|---|---|---|
| committer | Bilal <bilal@Bilals-MBP.localdomain> | 2018-09-07 13:59:39 -0400 |
| commit | b5d7e89d38db39b187ca5466b6898e94031a4ca3 (patch) | |
| tree | cea3d58c470a19e20db1c4b13300a622f4c7a1e1 | |
| parent | c6f4d7cfc3006f5dc3540cd0bde3eb4dce943f0a (diff) | |
| download | sdl_android-feature/issue_782_fix_proxy_broadcast.tar.gz | |
Always pass context to SdlSecurityBasefeature/issue_782_fix_proxy_broadcast
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 8 |
1 files changed, 6 insertions, 2 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 9ff2e3bb3..0bef4f24c 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -2093,8 +2093,12 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> SdlSecurityBase sec;
Service svc = getService();
SdlSecurityBase.setAppService(svc);
- SdlSecurityBase.setContext(_appContext);
-
+ if (svc != null && svc.getApplicationContext() != null){
+ SdlSecurityBase.setContext(svc.getApplicationContext());
+ } else {
+ SdlSecurityBase.setContext(_appContext);
+ }
+
for (Class<? extends SdlSecurityBase> cls : _secList)
{
try
|