diff options
| author | Joey Grover <joeygrover@gmail.com> | 2015-11-23 15:24:56 -0500 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2015-11-23 15:24:56 -0500 |
| commit | ff204a1d36e122923917d4174a243f94133c09e1 (patch) | |
| tree | 90d2d701e19c211c47f9f3d4045eb01e9dc08301 | |
| parent | fcd1a026198c484f26072d411c375fdcc3e11128 (diff) | |
| parent | 4008babad56d703ff9d5a3cb5ba8f14c67527939 (diff) | |
| download | sdl_android-ff204a1d36e122923917d4174a243f94133c09e1.tar.gz | |
Merge pull request #266 from smartdevicelink/feature/missing-proxy-getters
Feature/missing proxy getters
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java | 34 | ||||
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java | 6 |
2 files changed, 37 insertions, 3 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java index 7b97bcd21..093b919ac 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyALM.java @@ -12,6 +12,7 @@ import com.smartdevicelink.proxy.interfaces.IProxyListenerALM; import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
import com.smartdevicelink.proxy.rpc.ButtonCapabilities;
import com.smartdevicelink.proxy.rpc.DisplayCapabilities;
+import com.smartdevicelink.proxy.rpc.HMICapabilities;
import com.smartdevicelink.proxy.rpc.PresetBankCapabilities;
import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
import com.smartdevicelink.proxy.rpc.SoftButtonCapabilities;
@@ -1376,7 +1377,7 @@ public class SdlProxyALM extends SdlProxyBase<IProxyListenerALM> { * Gets AudioPassThruCapabilities set when application interface is registered.
*
* @return AudioPassThruCapabilities
- * @throws SyncException
+ * @throws SdlException
*/
public List<AudioPassThruCapabilities> getAudioPassThruCapabilities() throws SdlException {
// Test if proxy has been disposed
@@ -1384,9 +1385,9 @@ public class SdlProxyALM extends SdlProxyBase<IProxyListenerALM> { throw new SdlException("This object has been disposed, it is no long capable of executing methods.", SdlExceptionCause.SDL_PROXY_DISPOSED);
}
- // Test SYNC availability
+ // Test SDL availability
if (!_appInterfaceRegisterd) {
- throw new SdlException("SYNC is not connected. Unable to get the vehicleType.", SdlExceptionCause.SDL_UNAVAILABLE);
+ throw new SdlException("SDL is not connected. Unable to get the vehicleType.", SdlExceptionCause.SDL_UNAVAILABLE);
}
return _audioPassThruCapabilities;
}
@@ -1404,6 +1405,33 @@ public class SdlProxyALM extends SdlProxyBase<IProxyListenerALM> { return _diagModes;
}
+ public HMICapabilities getHmiCapabilities() throws SdlException {
+ // Test if proxy has been disposed
+ if (_proxyDisposed) {
+ throw new SdlException("This object has been disposed, it is no long capable of executing methods.", SdlExceptionCause.SDL_PROXY_DISPOSED);
+ }
+
+ // Test SDL availability
+ if (!_appInterfaceRegisterd) {
+ throw new SdlException("SDL is not connected. Unable to get the HMICapabilities.", SdlExceptionCause.SDL_UNAVAILABLE);
+ }
+ return _hmiCapabilities;
+ }
+
+
+ public String getSystemSoftwareVersion() throws SdlException {
+ // Test if proxy has been disposed
+ if (_proxyDisposed) {
+ throw new SdlException("This object has been disposed, it is no long capable of executing methods.", SdlExceptionCause.SDL_PROXY_DISPOSED);
+ }
+
+ // Test SDL availability
+ if (!_appInterfaceRegisterd) {
+ throw new SdlException("SDL is not connected. Unable to get the SystemSoftwareVersion.", SdlExceptionCause.SDL_UNAVAILABLE);
+ }
+ return _systemSoftwareVersion;
+ }
+
public boolean isAppResumeSuccess() throws SdlException {
// Test if proxy has been disposed
if (_proxyDisposed) {
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java index e4dddbf63..17c479050 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java @@ -205,6 +205,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> protected List<VrCapabilities> _vrCapabilities = null;
protected VehicleType _vehicleType = null;
protected List<AudioPassThruCapabilities> _audioPassThruCapabilities = null;
+ protected HMICapabilities _hmiCapabilities = null;
+ protected String _systemSoftwareVersion = null;
protected List<Integer> _diagModes = null;
protected Boolean firstTimeFull = true;
protected String _proxyVersionInfo = null; @@ -1706,6 +1708,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _vrCapabilities = msg.getVrCapabilities();
_vehicleType = msg.getVehicleType();
_audioPassThruCapabilities = msg.getAudioPassThruCapabilities();
+ _hmiCapabilities = msg.getHmiCapabilities();
+ _systemSoftwareVersion = msg.getSystemSoftwareVersion();
_proxyVersionInfo = msg.getProxyVersionInfo();
if (_bAppResumeEnabled)
@@ -1857,6 +1861,8 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> _vrCapabilities = msg.getVrCapabilities();
_vehicleType = msg.getVehicleType();
_audioPassThruCapabilities = msg.getAudioPassThruCapabilities();
+ _hmiCapabilities = msg.getHmiCapabilities();
+ _systemSoftwareVersion = msg.getSystemSoftwareVersion();
_proxyVersionInfo = msg.getProxyVersionInfo();
if (_bAppResumeEnabled)
|