Merge pull request #1291 from smartdevicelink/feature/deprecate_device_os

Deprecate DeviceInfo.DEVICE_OS

Author: JulianKast

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

@@ -1022,7 +1022,7 @@ public static DeviceInfo BuildDeviceInfo(String carrierName)
 	{
 		DeviceInfo msg = new DeviceInfo();
 		msg.setHardware(android.os.Build.MODEL);
-		msg.setOs(DeviceInfo.DEVICE_OS);
+		msg.setOs("Android");
 		msg.setOsVersion(Build.VERSION.RELEASE);
 		msg.setCarrier(carrierName);
 		return msg;

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

@@ -6721,7 +6721,7 @@ protected void registerAppInterfacePrivate(
 
 		DeviceInfo deviceInfo = new DeviceInfo();
 		deviceInfo.setHardware(android.os.Build.MODEL);
-		deviceInfo.setOs(DeviceInfo.DEVICE_OS);
+		deviceInfo.setOs("Android");
 		deviceInfo.setOsVersion(Build.VERSION.RELEASE);
 		deviceInfo.setCarrier(carrierName);
 

base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java

@@ -108,6 +108,7 @@ public class DeviceInfo extends RPCStruct{
     public static final String KEY_OS_VERSION = "osVersion";
     public static final String KEY_CARRIER = "carrier";
     public static final String KEY_MAX_NUMBER_RFCOMM_PORTS = "maxNumberRFCOMMPorts";
+    @Deprecated
     public static final String DEVICE_OS = "Android";
 
     public DeviceInfo() { }