Add the new getCapability() method to Isdl

Author: bilal-alsharifi

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java

@@ -998,6 +998,11 @@ public boolean removeOnRPCListener(FunctionID messageId, OnRPCListener listener)
 		@Override
 		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) { }
 
+		@Override
+		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
+			return null;
+		}
+
 		@Override
 		public SdlMsgVersion getSdlMsgVersion(){
 			return null;

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

@@ -866,6 +866,14 @@ public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCap
 			proxy.getCapability(systemCapabilityType, scListener);
 		}
 
+		@Override
+		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
+			if (proxy.getSystemCapabilityManager() != null) {
+				return proxy.getSystemCapabilityManager().getCapability(systemCapabilityType, scListener, forceUpdate);
+			}
+			return null;
+		}
+
 		@Override
 		public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
 			return proxy.isCapabilitySupported(systemCapabilityType);

android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java

@@ -449,6 +449,14 @@ public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCap
 			SdlProxyBase.this.getCapability(systemCapabilityType, scListener);
 		}
 
+		@Override
+		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
+			if (_systemCapabilityManager != null) {
+				return _systemCapabilityManager.getCapability(systemCapabilityType, scListener, forceUpdate);
+			}
+			return null;
+		}
+
 		@Override
 		public SdlMsgVersion getSdlMsgVersion(){
 			try {

base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java

@@ -208,6 +208,7 @@ public interface ISdl {
      * @param systemCapabilityType a system capability type that should be retrieved
      * @return the system capability provided if available, null if not
      */
+    @Deprecated
     Object getCapability(SystemCapabilityType systemCapabilityType);
 
     /**
@@ -216,8 +217,18 @@ public interface ISdl {
      * @param scListener listener that will be called when the system capability is retrieved. If already cached, it
      *                   will be called immediately
      */
+    @Deprecated
     void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener);
 
+    /** Gets the capability object that corresponds to the supplied capability type by returning the currently cached value immediately (or null) as well as calling the listener immediately with the cached value, if available. If not available, the listener will retrieve a new value and return that when the head unit responds.
+     * <strong>If capability is not cached, the method will return null and trigger the supplied listener when the capability becomes available</strong>
+     * @param systemCapabilityType type of capability desired
+     * @param scListener callback to execute upon retrieving capability
+     * @param forceUpdate flag to force getting a new fresh copy of the capability from the head unit even if it is cached
+     * @return desired capability if it is cached in the manager, otherwise returns a null object
+     */
+    Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate);
+
     /**
      * Check if capability is supported
      * @param systemCapabilityType a system capability type that should be checked for support