summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update javadocs for PermissionManager.addListenerdocumentation/permissionManager_addListenerRHenigan2020-05-281-1/+2
* Merge pull request #1144 from XevoInc/feature/issue-1132Bilal Alsharifi2020-05-2842-37/+299
|\
| * Merge remote-tracking branch 'upstream/develop' into feature/issue-1132Shinichi Watanabe2020-05-2841-404/+553
| |\ | |/ |/|
* | Merge pull request #1363 from smartdevicelink/feature/issue_1362Bilal Alsharifi2020-05-2723-270/+336
|\ \
| * | Update base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.javafeature/issue_1362Bilal Alsharifi2020-05-271-2/+2
| * | Fix rpcs param type in Isdl.sendRPCs()Bilal Alsharifi2020-05-275-5/+5
| * | Implement sendRPCs() in IsdlBilal Alsharifi2020-05-264-0/+28
| * | Deprecate some callbacks in ISdlBilal Alsharifi2020-05-261-0/+15
| * | Deprecate SdlConnectionStateBilal Alsharifi2020-05-221-6/+7
| * | Deprecate APIs to prepare for next major changeBilal Alsharifi2020-05-2217-264/+286
* | | Merge branch 'master' into developBilal Alsharifi2020-05-266-66/+84
|\ \ \
| * \ \ Merge pull request #1360 from smartdevicelink/hotfix/issue_13514.11.1Bilal Alsharifi2020-05-266-66/+84
| |\ \ \
| | * | | Update CHANGELOG.mdBilal Alsharifi2020-05-261-59/+3
| | * | | Update version to 4.11.1Bilal Alsharifi2020-05-263-3/+3
| | * | | Remove extra linehotfix/issue_1351Joey Grover2020-05-221-1/+0
| | * | | Fix spacing for commentJoey Grover2020-05-221-1/+1
| | * | | Update spacingJoey Grover2020-05-221-3/+3
| | * | | Add try/catch to setting prefs in exception handlrJoey Grover2020-05-221-1/+5
| | * | | Move exception handler set to start of oncreateJoey Grover2020-05-221-3/+3
| | * | | Fix #1351Joey Grover2020-05-202-4/+75
| |/ / /
* | | | Merge pull request #1357 from smartdevicelink/feature/issue_1353Julian Kast2020-05-223-9/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Update unit tests to reflect the OnPermissionChangeListener changesfeature/issue_1353Bilal Alsharifi2020-05-191-9/+24
| * | | Add toString() to PermissionStatusBilal Alsharifi2020-05-191-0/+5
| * | | Trigger OnPermissionChangeListener with cached value after adding itBilal Alsharifi2020-05-191-0/+3
* | | | Merge pull request #1359 from smartdevicelink/revert-1347-bugfix/issue_1343Bilal Alsharifi2020-05-216-39/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Bugfix/issue_1343 foreground permissions exception"revert-1347-bugfix/issue_1343Robert Henigan2020-05-206-39/+10
|/ / /
* | | Merge pull request #1347 from smartdevicelink/bugfix/issue_1343Bilal Alsharifi2020-05-196-10/+39
|\ \ \
| * | | Update android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTool...bugfix/issue_1343Robert Henigan2020-05-191-1/+1
| * | | Update android/sdl_android/src/main/java/com/smartdevicelink/util/AndroidTool...Robert Henigan2020-05-191-3/+1
| * | | safeStartforeground does not need permission checkRHenigan2020-05-191-10/+2
| * | | Feedback fixesRHenigan2020-05-185-91/+49
| * | | Bring safestart back to SdlRouterServiceRHenigan2020-05-142-12/+27
| * | | Implement AndroidTools.safeStartForegroundServiceRHenigan2020-05-136-13/+13
| * | | Establish safeStartForeground in AndroidToolsRHenigan2020-05-133-29/+77
| * | | Remove output.json fileRHenigan2020-05-131-1/+0
| * | | Check permissions before trying to startForegroundRHenigan2020-05-134-4/+23
| |/ /
* | | Merge pull request #1332 from smartdevicelink/Http_to_HttpsBilal Alsharifi2020-05-183-24/+29
|\ \ \
| * | | Add null check for urlHttp_to_HttpsBilal Alsharifi2020-05-141-20/+22
| * | | Update HTTPs replacement in URLsBilal Alsharifi2020-05-143-6/+6
| * | | Make urlHttps FinalRHenigan2020-05-131-1/+1
| * | | Feedback FixesRHenigan2020-05-133-9/+11
| * | | Remove uneeded importRHenigan2020-04-301-1/+0
| * | | Undo changes to OnSystemRequestRHenigan2020-04-301-31/+31
| * | | Merge branch 'develop' into Http_to_HttpsRHenigan2020-04-3057-267/+4533
| |\ \ \ | | |/ /
| * | | Replace http urls with https for android/javaSERHenigan2020-04-074-8/+8
| * | | replace http with httpsRHenigan2020-04-062-31/+33
* | | | Merge pull request #1350 from smartdevicelink/feature/issue_14Bilal Alsharifi2020-05-145-31/+39
|\ \ \ \
| * | | | Deprecate OnSdlChoiceChosenBilal Alsharifi2020-05-141-31/+32
| * | | | Checkput OnSdlChoiceChosen.java from developBilal Alsharifi2020-05-141-32/+31
| * | | | Deprecate internal RPCsfeature/issue_14Bilal Alsharifi2020-05-145-31/+39