Release 3.3.0

sdl_android_lib/src/com/smartdevicelink/proxy/RPCRequestFactory.java

@@ -775,7 +775,8 @@ public static UnsubscribeButton buildUnsubscribeButton(
 		return msg;
 	}	
 
-	public static SubscribeVehicleData BuildSubscribeVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
+	@SuppressWarnings("deprecation")
+    public static SubscribeVehicleData BuildSubscribeVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
 																 boolean instantFuelConsumption, boolean externalTemperature, boolean prndl, boolean tirePressure,
 																 boolean odometer, boolean beltStatus, boolean bodyInformation, boolean deviceStatus,
 																 boolean driverBraking, Integer correlationID) 
@@ -800,7 +801,8 @@ public static SubscribeVehicleData BuildSubscribeVehicleData(boolean gps, boolea
 		return msg;
 	}
 
-	public static UnsubscribeVehicleData BuildUnsubscribeVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
+	@SuppressWarnings("deprecation")
+    public static UnsubscribeVehicleData BuildUnsubscribeVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
 																	 boolean instantFuelConsumption, boolean externalTemperature, boolean prndl, boolean tirePressure,
 																	 boolean odometer, boolean beltStatus, boolean bodyInformation, boolean deviceStatus,
 																	 boolean driverBraking, Integer correlationID) 
@@ -825,7 +827,8 @@ public static UnsubscribeVehicleData BuildUnsubscribeVehicleData(boolean gps, bo
 		return msg;		
 	}
 
-	public static GetVehicleData BuildGetVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
+	@SuppressWarnings("deprecation")
+    public static GetVehicleData BuildGetVehicleData(boolean gps, boolean speed, boolean rpm, boolean fuelLevel, boolean fuelLevel_State,
 			 boolean instantFuelConsumption, boolean externalTemperature, boolean vin, boolean prndl, boolean tirePressure,
 			 boolean odometer, boolean beltStatus, boolean bodyInformation, boolean deviceStatus,
 			 boolean driverBraking, Integer correlationID)

sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java

@@ -1043,16 +1043,34 @@ public void sendTransportBroadcast()
 	/**
 	 *  Public method to enable the siphon transport
 	 */
-	public static void enableSiphonDebug() {
-		SiphonServer.enableSiphonServer();
+	public void enableSiphonDebug() {
+
+		short enabledPortNumber = SiphonServer.enableSiphonServer();
+		String sSiphonPortNumber = "Enabled Siphon Port Number: " + enabledPortNumber;
+		Intent sendIntent = createBroadcastIntent();
+		updateBroadcastIntent(sendIntent, "FUNCTION_NAME", "enableSiphonDebug");
+		updateBroadcastIntent(sendIntent, "COMMENT1", sSiphonPortNumber);
+		sendBroadcastIntent(sendIntent);
 	}
+
+
 
 	/**
 	 *  Public method to disable the Siphon Trace Server
 	 */
-	public static void disableSiphonDebug() {
-		SiphonServer.disableSiphonServer();
-	}	
+	public void disableSiphonDebug() {
+
+		short disabledPortNumber = SiphonServer.disableSiphonServer();
+		if (disabledPortNumber != -1) {
+		    String sSiphonPortNumber = "Disabled Siphon Port Number: " + disabledPortNumber;
+		    Intent sendIntent = createBroadcastIntent();
+		    updateBroadcastIntent(sendIntent, "FUNCTION_NAME", "disableSiphonDebug");
+		    updateBroadcastIntent(sendIntent, "COMMENT1", sSiphonPortNumber);
+		    sendBroadcastIntent(sendIntent);
+		}
+	}
+
+
 
 	/**
 	 *  Public method to enable the Debug Tool
@@ -2084,6 +2102,15 @@ public void run() {
             } else if (functionName.equals(FunctionID.SET_DISPLAY_LAYOUT)) {
                 // SetDisplayLayout
                 final SetDisplayLayoutResponse msg = new SetDisplayLayoutResponse(hash);
+
+                // successfully changed display layout - update layout capabilities
+                if(msg.getSuccess()){
+                    _displayCapabilities = msg.getDisplayCapabilities();
+                    _buttonCapabilities = msg.getButtonCapabilities();
+                    _presetBankCapabilities = msg.getPresetBankCapabilities();
+                    _softButtonCapabilities = msg.getSoftButtonCapabilities();
+                }
+
                 if (_callbackToUIThread) {
                     // Run in UI thread
                     _mainUIHandler.post(new Runnable() {

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GPSData.java

@@ -6,6 +6,7 @@
 import com.smartdevicelink.proxy.rpc.enums.CompassDirection;
 import com.smartdevicelink.proxy.rpc.enums.Dimension;
 import com.smartdevicelink.util.DebugTool;
+import com.smartdevicelink.util.SdlDataTypeConverter;
 
 /**
  * Describes the GPS data. Not all data will be available on all carlines.
@@ -193,7 +194,8 @@ public void setLongitudeDegrees(Double longitudeDegrees) {
      * @return longitude degrees
      */
     public Double getLongitudeDegrees() {
-    	return (Double) store.get(KEY_LONGITUDE_DEGREES);
+    	Object object = store.get(KEY_LONGITUDE_DEGREES);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -213,7 +215,8 @@ public void setLatitudeDegrees(Double latitudeDegrees) {
      * @return latitude degrees
      */
     public Double getLatitudeDegrees() {
-    	return (Double) store.get(KEY_LATITUDE_DEGREES);
+    	Object object = store.get(KEY_LATITUDE_DEGREES);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -374,7 +377,8 @@ public void setPdop(Double pdop) {
      * get  the positional dilution of precision
      */
     public Double getPdop() {
-    	return (Double) store.get(KEY_PDOP);
+    	Object object = store.get(KEY_PDOP);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -394,7 +398,8 @@ public void setHdop(Double hdop) {
      * @return the horizontal dilution of precision
      */
     public Double getHdop() {
-    	return (Double) store.get(KEY_HDOP);
+    	Object object = store.get(KEY_HDOP);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -414,7 +419,8 @@ public void setVdop(Double vdop) {
      * @return the vertical dilution of precision
      */
     public Double getVdop() {
-    	return (Double) store.get(KEY_VDOP);
+    	Object object = store.get(KEY_VDOP);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -496,7 +502,8 @@ public void setAltitude(Double altitude) {
      * @return altitude in meters
      */
     public Double getAltitude() {
-    	return (Double) store.get(KEY_ALTITUDE);
+    	Object object = store.get(KEY_ALTITUDE);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -515,7 +522,8 @@ public void setHeading(Double heading) {
      * get the heading
      */
     public Double getHeading() {
-    	return (Double) store.get(KEY_HEADING);
+    	Object object = store.get(KEY_HEADING);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     /**
@@ -535,6 +543,7 @@ public void setSpeed(Double speed) {
      * @return the speed in KPH
      */
     public Double getSpeed() {
-    	return (Double) store.get(KEY_SPEED);
+    	Object object = store.get(KEY_SPEED);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleData.java

@@ -78,16 +78,28 @@ public void setFuelLevel(Boolean fuelLevel) {
     public Boolean getFuelLevel() {
         return (Boolean) parameters.get(KEY_FUEL_LEVEL);
     }
+    @Deprecated
     public void setFuelLevel_State(Boolean fuelLevel_State) {
         if (fuelLevel_State != null) {
             parameters.put(KEY_FUEL_LEVEL_STATE, fuelLevel_State);
         } else {
-        	parameters.remove(KEY_FUEL_LEVEL_STATE);
+            parameters.remove(KEY_FUEL_LEVEL_STATE);
         }
     }
+    @Deprecated
     public Boolean getFuelLevel_State() {
         return (Boolean) parameters.get(KEY_FUEL_LEVEL_STATE);
     }
+    public void setFuelLevelState(Boolean fuelLevelState) {
+        if (fuelLevelState != null) {
+            parameters.put(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+        } else {
+            parameters.remove(KEY_FUEL_LEVEL_STATE);
+        }
+    }
+    public Boolean getFuelLevelState() {
+        return (Boolean) parameters.get(KEY_FUEL_LEVEL_STATE);
+    }
     public void setInstantFuelConsumption(Boolean instantFuelConsumption) {
         if (instantFuelConsumption != null) {
             parameters.put(KEY_INSTANT_FUEL_CONSUMPTION, instantFuelConsumption);

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java

@@ -10,6 +10,7 @@
 import com.smartdevicelink.proxy.rpc.enums.VehicleDataEventStatus;
 import com.smartdevicelink.proxy.rpc.enums.WiperStatus;
 import com.smartdevicelink.util.DebugTool;
+import com.smartdevicelink.util.SdlDataTypeConverter;
 
 public class GetVehicleDataResponse extends RPCResponse {
 	public static final String KEY_SPEED = "speed";
@@ -76,7 +77,8 @@ public void setSpeed(Double speed) {
     	}
     }
     public Double getSpeed() {
-    	return (Double) parameters.get(KEY_SPEED);
+    	Object object = parameters.get(KEY_SPEED);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
     public void setRpm(Integer rpm) {
     	if (rpm != null) {
@@ -96,25 +98,50 @@ public void setFuelLevel(Double fuelLevel) {
     	}
     }
     public Double getFuelLevel() {
-    	return (Double) parameters.get(KEY_FUEL_LEVEL);
+    	Object object = parameters.get(KEY_FUEL_LEVEL);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
+    @Deprecated
     public void setFuelLevel_State(ComponentVolumeStatus fuelLevel_State) {
-    	if (fuelLevel_State != null) {
-    		parameters.put(KEY_FUEL_LEVEL_STATE, fuelLevel_State);
-    	} else {
-    		parameters.remove(KEY_FUEL_LEVEL_STATE);
-    	}
+        if (fuelLevel_State != null) {
+            parameters.put(KEY_FUEL_LEVEL_STATE, fuelLevel_State);
+        } else {
+            parameters.remove(KEY_FUEL_LEVEL_STATE);
+        }
     }
+    @Deprecated
     public ComponentVolumeStatus getFuelLevel_State() {
         Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
         if (obj instanceof ComponentVolumeStatus) {
             return (ComponentVolumeStatus) obj;
         } else if (obj instanceof String) {
-        	ComponentVolumeStatus theCode = null;
+            ComponentVolumeStatus theCode = null;
+            try {
+                theCode = ComponentVolumeStatus.valueForString((String) obj);
+            } catch (Exception e) {
+                DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL_STATE, e);
+            }
+            return theCode;
+        }
+        return null;
+    }
+    public void setFuelLevelState(ComponentVolumeStatus fuelLevelState) {
+        if (fuelLevelState != null) {
+            parameters.put(KEY_FUEL_LEVEL_STATE, fuelLevelState);
+        } else {
+            parameters.remove(KEY_FUEL_LEVEL_STATE);
+        }
+    }
+    public ComponentVolumeStatus getFuelLevelState() {
+        Object obj = parameters.get(KEY_FUEL_LEVEL_STATE);
+        if (obj instanceof ComponentVolumeStatus) {
+            return (ComponentVolumeStatus) obj;
+        } else if (obj instanceof String) {
+            ComponentVolumeStatus theCode = null;
             try {
                 theCode = ComponentVolumeStatus.valueForString((String) obj);
             } catch (Exception e) {
-            	DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL_STATE, e);
+                DebugTool.logError("Failed to parse " + getClass().getSimpleName() + "." + KEY_FUEL_LEVEL_STATE, e);
             }
             return theCode;
         }
@@ -128,7 +155,8 @@ public void setInstantFuelConsumption(Double instantFuelConsumption) {
     	}
     }
     public Double getInstantFuelConsumption() {
-    	return (Double) parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+    	Object object = parameters.get(KEY_INSTANT_FUEL_CONSUMPTION);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
     public void setExternalTemperature(Double externalTemperature) {
     	if (externalTemperature != null) {
@@ -138,7 +166,8 @@ public void setExternalTemperature(Double externalTemperature) {
     	}
     }
     public Double getExternalTemperature() {
-    	return (Double) parameters.get(KEY_EXTERNAL_TEMPERATURE);
+    	Object object = parameters.get(KEY_EXTERNAL_TEMPERATURE);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
     public void setVin(String vin) {
     	if (vin != null) {
@@ -340,7 +369,8 @@ public void setEngineTorque(Double engineTorque) {
         }
     }
     public Double getEngineTorque() {
-    	return (Double) parameters.get(KEY_ENGINE_TORQUE);
+    	Object object = parameters.get(KEY_ENGINE_TORQUE);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     public void setAccPedalPosition(Double accPedalPosition) {
@@ -351,7 +381,8 @@ public void setAccPedalPosition(Double accPedalPosition) {
         }
     }
     public Double getAccPedalPosition() {
-    	return (Double) parameters.get(KEY_ACC_PEDAL_POSITION);
+    	Object object = parameters.get(KEY_ACC_PEDAL_POSITION);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }
 
     public void setSteeringWheelAngle(Double steeringWheelAngle) {
@@ -362,7 +393,8 @@ public void setSteeringWheelAngle(Double steeringWheelAngle) {
         }
     }
     public Double getSteeringWheelAngle() {
-    	return (Double) parameters.get(KEY_STEERING_WHEEL_ANGLE);
+    	Object object = parameters.get(KEY_STEERING_WHEEL_ANGLE);
+    	return SdlDataTypeConverter.objectToDouble(object);
     }    
 
     public void setECallInfo(ECallInfo eCallInfo) {

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java

@@ -4,7 +4,6 @@
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.proxy.RPCStruct;
 
 /**
  * Binary data is in binary part of hybrid msg.
@@ -56,13 +55,9 @@ public OnAudioPassThru(Hashtable<String, Object> hash) {
         super(hash);
     }
     public void setAPTData(byte[] aptData) {
-        if (aptData != null) {
-            store.put(RPCStruct.KEY_BULK_DATA, aptData);
-        } else {
-        	store.remove(RPCStruct.KEY_BULK_DATA);
-        }
+        setBulkData(aptData);
     }
     public byte[] getAPTData() {
-        return (byte[]) store.get(RPCStruct.KEY_BULK_DATA);
+        return getBulkData();
     }
 }