diff options
| author | Joel Fischer <joeljfischer@gmail.com> | 2018-10-19 10:56:22 -0400 |
|---|---|---|
| committer | Joel Fischer <joeljfischer@gmail.com> | 2018-10-19 10:56:22 -0400 |
| commit | 0095123ffeb9cf1d104f9c76653710a36a49b8a0 (patch) | |
| tree | 3130ecec2bd142ef6c94a2ac7b17cc9a6899cd0b | |
| parent | 6eef809963502d7a72ddc3a41f7af34cb0293876 (diff) | |
| parent | 7ede32259a8229fea6804eccbc76cb2b9d528833 (diff) | |
| download | sdl_ios-0095123ffeb9cf1d104f9c76653710a36a49b8a0.tar.gz | |
Merge branch 'master' into develop
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLChoiceSet.m | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e3878b4f2..f3363eba3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ * Add new vehicle capabilities that can be remotely controlled by an application: Seat Controls [SDL-0105] [#792](https://github.com/smartdevicelink/sdl_ios/issues/792), lights, display settings, and additional audio capabilities [SDL-0099] [#755](https://github.com/smartdevicelink/sdl_ios/issues/755), [SDL-0165] [#954](https://github.com/smartdevicelink/sdl_ios/issues/954), [SDL-0182] [#1022](https://github.com/smartdevicelink/sdl_ios/issues/1022). * Add the ability to check the status of remote control modules [SDL-0106] [#800](https://github.com/smartdevicelink/sdl_ios/issues/800), [SDL-0172] [#990](https://github.com/smartdevicelink/sdl_ios/issues/990). * Add the ability to modify the play / pause button to show either play, pause, stop, or play / pause [SDL-0109] [#892](https://github.com/smartdevicelink/sdl_ios/issues/892). +* Support both USB / BT and WiFi transports simultaneously when streaming video on supported head units [SDL-0141] [#900](https://github.com/smartdevicelink/sdl_ios/issues/900). * Allow apps to alter template primary, secondary, and tertiary colors while connected to a supported head unit through the RegisterAppInterface and SetDisplayLayout APIs [SDL-0147] [#909](https://github.com/smartdevicelink/sdl_ios/issues/909). * Allow checking for the availability of a secondary graphic [SDL-0151] [#917](https://github.com/smartdevicelink/sdl_ios/issues/917). * Support short and full appIds [SDL-0153] [#942](https://github.com/smartdevicelink/sdl_ios/issues/942). diff --git a/SmartDeviceLink/SDLChoiceSet.m b/SmartDeviceLink/SDLChoiceSet.m index 62bd97470..ab32b1371 100644 --- a/SmartDeviceLink/SDLChoiceSet.m +++ b/SmartDeviceLink/SDLChoiceSet.m @@ -47,7 +47,7 @@ static SDLChoiceSetLayout _defaultLayout = SDLChoiceSetLayoutList; if (!self) { return nil; } if (choices.count == 0 || choices.count > 100) { - SDLLogW(@"Attempted to create a choice set with %lu choices; Only 1 - 100 choices are valid", choices.count); + SDLLogW(@"Attempted to create a choice set with %lu choices; Only 1 - 100 choices are valid", (unsigned long)choices.count); return nil; } @@ -57,7 +57,7 @@ static SDLChoiceSetLayout _defaultLayout = SDLChoiceSetLayoutList; } if (title.length == 0 || title.length > 500) { - SDLLogW(@"Attempted to create a choice set with a %lu length. Only 500 characters are supported", title.length); + SDLLogW(@"Attempted to create a choice set with a %lu length. Only 500 characters are supported", (unsigned long)title.length); return nil; } |