delta/smartdevicelink/sdl_android.git - github.com: smartdevicelink/sdl

	Commit message (Collapse)	Author	Age	Files	Lines
*	PR feedback fixes	Noah Stanford	2022-01-31	1	-2/+1
\|
*	Revert some excessive formatting changes	Noah Stanford	2022-01-10	7	-23/+27
\|
*	Reformat android Java files	Noah Stanford	2022-01-05	12	-55/+52
\|
*	Replace tabbed indents with 4 spaces	Noah Stanford	2022-01-05	2	-6/+6
\|
*	Add test	RHeniz	2021-11-15	1	-0/+8
\|
*	Align to iOS	RHeniz	2021-11-15	1	-3/+3
\|
*	Update SecurityQueryPayload to include json data	RHeniz	2021-10-22	1	-13/+10
\|
*	Merge pull request #1610 from ↵	Bilal Alsharifi	2021-09-23	1	-100/+2
\|\ \| \| \| \| \| \| \| \|	smartdevicelink/feature/issue_1605_menu_manager_refactor Refactor MenuManager to use queues
\| *	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-09-14	3	-7/+163
\| \|\
\| * \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-07-12	2	-18/+181
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java # base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
\| * \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-04-28	12	-28/+312
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuManagerTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java # base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
\| * \ \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-02-25	8	-1/+245
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
\| * \ \ \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-02-23	5	-0/+64
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/menu/MenuCellTests.java # base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java # base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java
\| * \ \ \ \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-02-12	1	-1/+2
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-02-10	13	-1/+226
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'develop' into feature/issue_1605_menu_manager_refactor	Bilal Alsharifi	2021-02-09	13	-1/+351
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add unit tests for ShouldCellIncludeImage()	Bilal Alsharifi	2021-02-05	1	-98/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into bugfix/issue_1720	Henigan	2021-09-22	3	-7/+163
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Feature/0293 oem android specific (#1604)	Kostiantyn Boskin	2021-08-31	3	-7/+163
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* [0293] - Implement Android specific part * [0293] - Fix tag name * [0293] - Fix hardware version * [0293] - Fix supported_vehicle_type.xml * [0293] - Applied logs * [0293] - Remove the check * [0293] - Remove the check * [0293] - Remove the check * [0293] - Remove the check * [0293] - Handle NPE * [0293] - Add mocks * [0293] - Update the deserialization function * [0293] - Update the deserialization function, fix shared preferences * [0293] - Update the logic * [0293] - Update parsing method * [0293] - Migrate to separate class * [0293] - Fix tests * [0293] - Fix tests * [0293] - Fix tests * [0293] - Fix comments * [0293] - Rename variables * [0293] - Apply latest patch * [0293] - Fix comments * Rollbacking the patch This reverts commit 23bc6d5cdb06df88fea3ff7d747c1a51fdd6a146. * Revert "[0293]" This reverts commit a77b24ceedcfe9dd5598554a232d4e815e14f334. * [0293] - Update according to the latest revision * [0293] - Remove javadoc * [0293] - Align variables with Livio proposal * Apply suggestions from code review [0293] - Fix pr comments Co-authored-by: Julian Kast <Julian.kast@livio.io> * [0296] - Fix pr comments * [0296] - Fix pr comments * [0293] - Fix pr comments * [0293] - Fix PR comments * [0293] - Fix javaSE project compilation * Apply suggestions from code review Co-authored-by: Julian Kast <Julian.kast@livio.io> * [0293] - Fix pr comments * [0293] - Fix protocol version * [0293] - Fix protocol version in header * Increment ROUTER_SERVICE_VERSION_NUMBER * fixup! Increment ROUTER_SERVICE_VERSION_NUMBER * Fix crash in broadcast receiver Added missing device null check * Add missing vehicle type check * Update onSystemInfoReceived logic * Update old router service check * Fix foreground service icon for unsupported app * Add vehicle type check to SDL receiver Also, common functions were moved out to AndroidTools class * Include vehicle type into the ping intent In this case corresponding SDL receiver will be able to check if vehicle type is supported by specific OEM app or not * Fix extracting metadata from manifest * Fix initial protocol version for StartService SDL core will respond with negotiated version: Core with V1-4 will respond with max own supported version and won't include VI into ack bson parameters Core with V5+ will respond with negotiated protocol version and include VI into ack bson parameters if core supports it * Replace broadcast receiver with callback * fix notifications on disconnect * fix connection after disconnect * replace ISessionListener * Revert changes in the SdlManagerListener * Remove changes in the 'HelloSdlApp' * Fix logic in the deserialization vehicle method * Update after comment discussion * Update after comment discussion * Revert changes * Remove ISessionListener and lifecycle onError call before onClose * Update unit test and SdlService * Fix shutting down the RPC service * Add a version check * Add some Java Docs and apply suggested changes * Fix saving vehicle type * Fix Java Docs * Fix Java Docs * Fix some potential NPE * Refactor some names * Refactor to more generic approach * Remove vehicleType param from callback * Add return statement * Code Review Fixes * Code Review Fixes * Fix some potential NPE * Fix checkIfVehicleSupported Co-authored-by: kboskin <kboskin> Co-authored-by: Julian Kast <Julian.kast@livio.io> Co-authored-by: Andrii Kalinich <AKalinich@luxoft.com> Co-authored-by: Vadym Luchko (gitHub) <vluchko@luxoft.com> Co-authored-by: Iryna Lytvynenko (GitHub) <ILytvynenko@luxoft.com> Co-authored-by: Yaroslav Lutsenko (GitHub) <yaroslav.lutsenko@dxc.com> Co-authored-by: Yaroslav Lutsenko (GitHub) <86004378+YaroslavLutsenko@users.noreply.github.com>
* \| \| \| \| \| \| \| \|	Align to latest iOS PR	Henigan	2021-09-01	6	-256/+250
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add QueryID Tests	Henigan	2021-08-13	2	-0/+115
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add QueryErrorCodeTests	Henigan	2021-08-13	2	-0/+213
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add enum unit tests	Henigan	2021-08-12	2	-0/+121
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Refactor to SecurityQueryPayload	Henigan	2021-08-12	1	-13/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove SecurityQuery in favor of BQH	Henigan	2021-08-12	1	-13/+12
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix Lib response	Henigan	2021-08-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update QueryID to byte array enum	Henigan	2021-08-11	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix bit manipulation	Henigan	2021-08-11	1	-0/+39
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove ErrorCode test	Henigan	2021-08-04	1	-25/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add SecurityQuery and BinaryQueryHeader	Henigan	2021-08-04	1	-0/+118
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Add a way to manually trigger the Github CI (#1711)	Bilal Alsharifi	2021-06-29	1	-13/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix testTouchEvents() * Add workflow_dispatch CI trigger
* \| \| \| \| \| \| \|	Improve packet state machine (#1683)	Joey Grover	2021-05-17	1	-5/+170
\| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Make SdlPSM more robust Add more checks that will help the PSM churn through bad data to get back on track. Also add a try/catch block for each attempt to prevent any production crashes. * Overhaul SdlPsm unit tests and add more * Update base/src/main/java/com/smartdevicelink/transport/SdlPsm.java Co-authored-by: Julian Kast <Julian.kast@livio.io> Co-authored-by: Julian Kast <Julian.kast@livio.io>
* \| \| \| \| \| \|	Fix TestValues names for RPCGenericTests	Julian Kast	2021-03-15	7	-37/+38
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix spelling of Auxiliary (#1633)	Robert Henigan	2021-03-11	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: Henigan <rheniga1@MGC12Z921DLVCG.fbpld77.ford.com>
* \| \| \| \| \| \|	Merge branch 'develop' into ↵	kboskin	2021-02-25	24	-3/+537
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	feature/0296_possibility_to_update_video_streaming_capabilities # Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
\| * \| \| \| \| \|	Merge pull request #1587 from LuxoftSDL/feature/0298_keyboard_enchancements	Bilal Alsharifi	2021-02-25	8	-1/+246
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|	[0238] Keyboard Enhancements
\| \| * \| \| \| \|	[0238]	kboskin	2021-02-15	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix tests
\| \| * \| \| \| \|	Merge branch 'develop' into feature/0298_keyboard_enchancements	kboskin	2021-02-11	16	-3/+579
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
\| \| * \| \| \| \|	Merge remote-tracking branch 'origin/develop' into ↵	Andrii Kalinich	2021-02-06	12	-2/+566
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|	feature/0298_keyboard_enchancements
\| \| * \| \| \| \|	Make changes according to revision	Andrii Kalinich	2021-02-06	5	-232/+31
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	[0298]	kboskin	2020-12-21	7	-35/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix pr comments
\| \| * \| \| \| \|	[0238]	kboskin	2020-12-13	1	-1/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Imports rollback
\| \| * \| \| \| \|	[0238]	kboskin	2020-12-13	9	-98/+362
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Implement changes according to the proposal
\| * \| \| \| \| \|	Merge branch 'develop' into feature/issue_1246	Henigan	2021-02-15	26	-103/+1146
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	[SDL-0293] OEM Exclusive App Support - Protocol & Manager layers (#1618)	Joey Grover	2021-02-11	1	-1/+2
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Implement 0293 Does not include android specific implementaiton pieces * Update hello world apps * Update unit tests * Increase max protocol version * Add missing nullable tag in SystemInfo * Add missing nullable tag to method in SystemInfo * Apply suggestions from code review Correctly format if statement Co-authored-by: Julian Kast <Julian.kast@livio.io> Co-authored-by: Julian Kast <Julian.kast@livio.io>
\| \| * \| \| \|	Merge branch 'develop' into feature/0269_new_vehicle_data_climate_data	kboskin	2021-02-10	14	-1/+353
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/assets/json/GetVehicleData.json # android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json # android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/VehicleDataHelper.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/VehicleDataTypeTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnVehicleDataTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/GetVehicleDataTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/SubscribeVehicleDataTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/requests/UnsubscribeVehicleDataTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/GetVehicleDataResponseTests.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java # base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleData.java # base/src/main/java/com/smartdevicelink/proxy/rpc/GetVehicleDataResponse.java # base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java # base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleData.java # base/src/main/java/com/smartdevicelink/proxy/rpc/SubscribeVehicleDataResponse.java # base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleData.java # base/src/main/java/com/smartdevicelink/proxy/rpc/UnsubscribeVehicleDataResponse.java
\| \| * \ \ \ \	Merge branch 'develop' into feature/0269_new_vehicle_data_climate_data	kboskin	2021-02-09	4	-103/+88
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
\| \| * \| \| \| \|	Merge branch 'develop' into feature/0269_new_vehicle_data_climate_data	kboskin	2021-01-28	7	-1/+413
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java # android/sdl_android/src/androidTest/java/com/smartdevicelink/test/Validator.java
\| \| * \ \ \ \ \	Merge branch 'develop' into feature/0269_new_vehicle_data_climate_data	kboskin	2021-01-20	4	-4/+72
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	[0269]	kboskin	2020-12-12	5	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Fix review comments