Update android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java

bilal-alsharifi · joeygrover · web-flow · commit 0a7a25302033 · 2020-04-08T13:46:02.000-04:00
Co-Authored-By: Joey Grover &lt;joeygrover@gmail.com&gt;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -868,7 +868,7 @@ public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCap
 
 		@Override
 		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-			if (proxy.getSystemCapabilityManager() != null) {
+			if (proxy != null && proxy.getSystemCapabilityManager() != null) {
 				return proxy.getSystemCapabilityManager().getCapability(systemCapabilityType, scListener, forceUpdate);
 			}
 			return null;

Original file line number	Diff line number	Diff line change
`@@ -868,7 +868,7 @@ public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCap`
`868`	`868`
`869`	`869`	`@Override`
`870`	`870`	`public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {`
`871`		`- if (proxy.getSystemCapabilityManager() != null) {`
	`871`	`+ if (proxy != null && proxy.getSystemCapabilityManager() != null) {`
`872`	`872`	`return proxy.getSystemCapabilityManager().getCapability(systemCapabilityType, scListener, forceUpdate);`
`873`	`873`	`}`
`874`	`874`	`return null;`