diff options
| author | Julian Kast <julian@livio.com> | 2020-03-10 12:27:19 -0400 |
|---|---|---|
| committer | Julian Kast <julian@livio.com> | 2020-03-10 12:27:19 -0400 |
| commit | 21450c41b8bcbf95d826a2aa8687bd195e85862d (patch) | |
| tree | 48daafb51dc6c324fdbf8cb1fb6330b851a45592 /android/sdl_android/src/main | |
| parent | 738af48f45a92ac568a075a8ef44a4e31a68f11d (diff) | |
| parent | 0228f10e4d3d6cc5e0102e7e1abb95455b060bf5 (diff) | |
| download | sdl_android-21450c41b8bcbf95d826a2aa8687bd195e85862d.tar.gz | |
Merge branch 'develop' into add_Overwrite_Property
Diffstat (limited to 'android/sdl_android/src/main')
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/RPCRequestFactory.java | 2 | ||||
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 2 |
2 files changed, 2 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);
|