diff options
| author | Brett <3911458+BrettyWhite@users.noreply.github.com> | 2018-09-06 15:03:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 15:03:26 -0400 |
| commit | ec4358c6020ee7f56b3421ea1b529c840eda26a0 (patch) | |
| tree | a1da6321680b33192d50047f5ccc58718dd0e7e3 | |
| parent | bf25cbc967bb32c4a14d6902b3990cc2383a069d (diff) | |
| parent | b66969a558977ea43ce452bc9dc614b98a8bd25a (diff) | |
| download | sdl_android-ec4358c6020ee7f56b3421ea1b529c840eda26a0.tar.gz | |
Merge pull request #861 from smartdevicelink/feature/issue_782_Add_SystemCapabilityManager
Add SystemCapabilityManager to SdlManager
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java | 11 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 8 |
2 files changed, 19 insertions, 0 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java index 5f5342701..7c2b79734 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java +++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java @@ -13,6 +13,7 @@ import com.smartdevicelink.protocol.enums.SessionType; import com.smartdevicelink.proxy.RPCMessage; import com.smartdevicelink.proxy.RPCRequest; import com.smartdevicelink.proxy.SdlProxyBase; +import com.smartdevicelink.proxy.SystemCapabilityManager; import com.smartdevicelink.proxy.callbacks.OnServiceEnded; import com.smartdevicelink.proxy.callbacks.OnServiceNACKed; import com.smartdevicelink.proxy.interfaces.IAudioStreamListener; @@ -454,6 +455,16 @@ public class SdlManager{ } + /** + * Gets the SystemCapabilityManager. <br> + * <strong>Note: SystemCapabilityManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong> + * @return a SystemCapabilityManager object + */ + public SystemCapabilityManager getSystemCapabilityManager(){ + return proxy.getSystemCapabilityManager(); + } + + // PROTECTED GETTERS protected String getAppName() { return appName; } 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 2dc48c24c..f2ce573a3 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -7019,6 +7019,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> sendRPCRequest(msg);
}
+ /**
+ * Gets the SystemCapabilityManager. <br>
+ * @return a SystemCapabilityManager object
+ */
+ public SystemCapabilityManager getSystemCapabilityManager() {
+ return _systemCapabilityManager;
+ }
+
@SuppressWarnings("unused")
public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType) {
return _systemCapabilityManager != null && _systemCapabilityManager.isCapabilitySupported(systemCapabilityType);
|