diff options
| author | Julian Kast <Julian.kast@livio.io> | 2020-03-03 14:36:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 14:36:37 -0500 |
| commit | 1f6662f1ac7bbc85b494930866721c46f7e371be (patch) | |
| tree | 347cc0e9c43f278ff1664b039bd543ff3162a8bc | |
| parent | eb7a74d45024f31d87280f5e7edaa5837cfab513 (diff) | |
| parent | dd63e1b31d5c041813746451dca28620868503ed (diff) | |
| download | sdl_android-1f6662f1ac7bbc85b494930866721c46f7e371be.tar.gz | |
Merge pull request #1291 from smartdevicelink/feature/deprecate_device_os
Deprecate DeviceInfo.DEVICE_OS
3 files changed, 3 insertions, 2 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java index e787fb77d..d046fe5ad 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java @@ -1022,7 +1022,7 @@ public class RPCRequestFactory { {
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;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 5c886ff67..f6f5c7688 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6721,7 +6721,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> 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);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java index 2322b2f24..8113f2add 100644 --- a/base/src/main/java/com/smartdevicelink/proxy/rpc/DeviceInfo.java +++ b/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() { }
|