diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-10-17 14:51:39 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2017-10-17 14:51:39 -0400 |
| commit | a1b2703bf565d265f7aa9342a6ae7b60c2666678 (patch) | |
| tree | 3a5724f8b74e4f01154e65171274bee8237014d7 | |
| parent | ded2fcdf307804a539a2186da96e36a6a839782c (diff) | |
| download | sdl_android-a1b2703bf565d265f7aa9342a6ae7b60c2666678.tar.gz | |
Fix potential NPE when retrieving capabilities and add isCapabilitySupported method
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 15 |
1 files changed, 13 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 9bc41c294..e132997e2 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6110,13 +6110,24 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
@SuppressWarnings("unused")
+ public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType) {
+ return _systemCapabilityManager != null && _systemCapabilityManager.isCapabilitySupported(systemCapabilityType);
+ }
+
+ @SuppressWarnings("unused")
public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener){
- _systemCapabilityManager.getCapability(systemCapabilityType, scListener);
+ if(_systemCapabilityManager != null){
+ _systemCapabilityManager.getCapability(systemCapabilityType, scListener);
+ }
}
@SuppressWarnings("unused")
public Object getCapability(SystemCapabilityType systemCapabilityType){
- return _systemCapabilityManager.getCapability(systemCapabilityType);
+ if(_systemCapabilityManager != null ){
+ return _systemCapabilityManager.getCapability(systemCapabilityType);
+ }else{
+ return null;
+ }
}
/* ******************* END Public Helper Methods *************************/
|