New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(android)(8_1_X): improved merge of <uses-feature/> elements #11111
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- [TIMOB-27304] Fixed so that Android setting <uses-feature/> required "true" in "tiapp.xml" should override "false" setting in libraries. * Merge is supposed to do a logical-OR on the "android:required" value. - Added "tools:replace" attribute support to <uses-feature/>. * Allows overriding "android:required" to "false" if set "true" by library. (Only means of doing this.)
Tests:
|
ypbnv
approved these changes
Aug 5, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
FR passed. Correct value of elements in manifest file based on OR(ing) of values from all the involved xml files. |
rlustemberg
added a commit
to inzdr/titanium_mobile
that referenced
this pull request
Aug 21, 2019
* 8_1_X: (46 commits) fix(ios): exclude all frameworks from optimizing files step (8_1_X) (tidev#10996) fix(android): fix asset encryption on windows 32bit java (tidev#11155) fix(ios): add script message handler for local files only (tidev#11086) fix(android): improve merge of <uses-feature/> elements (tidev#11111) fix(android): splash open animation sometimes stutters on cold start (tidev#11140) fix(android): fix dialog without selectedIndex reusage fix(android): resuming with intent "FLAG_ACTIVITY_MULTIPLE_TASK" can hang the app (tidev#11081) fix(android): regression where closing root window from child window causes app exit issues as of 8.0.1 (tidev#11093) fix(android): fix reusing a dialog with a new "parent" window (tidev#11096) chore(release): bump version fix(ios): console.log does not log properly if it has multiple arguments (tidev#11125) fix(android): update titanium_prep windows binaries chore(android)(8_1_X): update titanium_prep binaries (tidev#11100) fix(android)(8_1_X): ListView's SearchBar/SearchView wrongly overlaps rows as of 8.0.1 (tidev#11105) chore(android): update aps-analytics (tidev#11101) fix(ios): fix crashes in calendar upon giving permission (tidev#11078) fix(ios,android)(8_1_X): implement exception signal handler (tidev#11077) fix(cli): add deprecation notice for node < 10.13 (tidev#11063) test(db): bump up timeout test(db): drop long-running query count to 5000 rows ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JIRA: https://jira.appcelerator.org/browse/TIMOB-27304
Cherry-pick of PR: #11110