Google Git
Sign in
android / platform / frameworks / support / 7895e4059d129dacff5987a6073ca93bfcb0e18f
commit7895e4059d129dacff5987a6073ca93bfcb0e18f[log] [tgz]
authormzgreen <[email protected]>Thu Mar 31 14:07:04 2022 +0000
committerCopybara-Service <[email protected]>Thu Mar 31 07:08:39 2022 -0700
treeae5935ad162e278facde777950dcf72c858a3aea
parent257fce5470a342f77e61441d4a69bc0bb185b51a [diff]
[GH] Introduce "NONE" conflict resolution strategy

## Proposed Changes

Currently Room uses "ABORT" resolution strategy as a default. It means that for `@Insert` and `@Update` annotated methods, Room compiler generates SQL code containing on conflict statements. This prevents INSERT/UPDATE triggers from specifying their own resolution strategy.

This change adds "NONE" conflict resolution strategy. If "NONE" strategy is set, then the Room compiler won't generate on conflict statements for @Insert and @Update annotated methods.

## Testing

Test: /gradlew test connectedCheck

## Issues Fixed

Fixes: b/154196564

This is an imported pull request from https://github.com/androidx/androidx/pull/343.

Resolves #343
Github-Pr-Head-Sha: fda2110ed177dc54378eca807149edc634572ac6
GitOrigin-RevId: 1c54e1f9ba5df3fd61e6b239c99222863e6cd3b7
Change-Id: I8e5d8bc624e6a83b51f20cea0dfab04ce5ce18b0
14 files changed
tree: ae5935ad162e278facde777950dcf72c858a3aea
  1. .github/
  2. .idea/
  3. activity/
  4. ads/
  5. annotation/
  6. appcompat/
  7. appsearch/
  8. arch/
  9. asynclayoutinflater/
  10. autofill/
  11. benchmark/
  12. biometric/
  13. browser/
  14. buildSrc/
  15. buildSrc-tests/
  16. busytown/
  17. camera/
  18. car/
  19. cardview/
  20. collection/
  21. collection2/
  22. compose/
  23. concurrent/
  24. contentpager/
  25. coordinatorlayout/
  26. core/
  27. cursoradapter/
  28. customview/
  29. datastore/
  30. development/
  31. docs/
  32. docs-public/
  33. docs-tip-of-tree/
  34. documentfile/
  35. draganddrop/
  36. drawerlayout/
  37. dynamicanimation/
  38. emoji/
  39. emoji2/
  40. enterprise/
  41. exifinterface/
  42. external/
  43. fakeannotations/
  44. fragment/
  45. frameworks/
  46. glance/
  47. gradle/
  48. gridlayout/
  49. health/
  50. heifwriter/
  51. hilt/
  52. ink/
  53. inspection/
  54. interpolator/
  55. jetifier/
  56. leanback/
  57. lifecycle/
  58. lint-checks/
  59. lint-demos/
  60. loader/
  61. media/
  62. media2/
  63. mediarouter/
  64. metrics/
  65. navigation/
  66. paging/
  67. palette/
  68. percentlayout/
  69. placeholder-tests/
  70. playground-common/
  71. preference/
  72. print/
  73. profileinstaller/
  74. recommendation/
  75. recyclerview/
  76. remotecallback/
  77. resourceinspection/
  78. room/
  79. samples/
  80. savedstate/
  81. security/
  82. sharetarget/
  83. slice/
  84. slidingpanelayout/
  85. sqlite/
  86. startup/
  87. swiperefreshlayout/
  88. temp/
  89. template/
  90. test/
  91. testutils/
  92. text/
  93. textclassifier/
  94. tracing/
  95. transition/
  96. tvprovider/
  97. vectordrawable/
  98. versionedparcelable/
  99. viewpager/
  100. viewpager2/
  101. wear/
  102. webkit/
  103. window/
  104. work/
  105. .gitignore
  106. .mailmap
  107. build.gradle
  108. cleanBuild.sh
  109. code-review.md
  110. CONTRIBUTING.md
  111. gradle.properties
  112. gradlew
  113. include-composite-deps.gradle
  114. include-support-library.gradle
  115. libraryversions.toml
  116. LICENSE.txt
  117. OWNERS
  118. PREUPLOAD.cfg
  119. README.md
  120. settings.gradle
  121. studiow
  122. TEXT_OWNERS
README.md

Android Jetpack

Revved up by Gradle Enterprise

Jetpack is a suite of libraries, tools, and guidance to help developers write high-quality apps easier. These components help you follow best practices, free you from writing boilerplate code, and simplify complex tasks, so you can focus on the code you care about.

Jetpack comprises the androidx.* package libraries, unbundled from the platform APIs. This means that it offers backward compatibility and is updated more frequently than the Android platform, making sure you always have access to the latest and greatest versions of the Jetpack components.

Our official AARs and JARs binaries are distributed through Google Maven.

You can learn more about using it from Android Jetpack landing page.

Contribution Guide

For contributions via GitHub, see the GitHub Contribution Guide.

Note: The contributions workflow via GitHub is currently experimental - only contributions to the following projects are being accepted at this time:

Code Review Etiquette

When contributing to Jetpack, follow the code review etiquette.

Accepted Types of Contributions

  • Bug fixes - needs a corresponding bug report in the Android Issue Tracker
  • Each bug fix is expected to come with tests
  • Fixing spelling errors
  • Updating documentation
  • Adding new tests to the area that is not currently covered by tests
  • New features to existing libraries if the feature request bug has been approved by an AndroidX team member.

We are not currently accepting new modules.

Checking Out the Code

Head over to the onboarding docs to learn more about getting set up and the development workflow!

Continuous integration

Our continuous integration system builds all in progress (and potentially unstable) libraries as new changes are merged. You can manually download these AARs and JARs for your experimentation.

Password and Contributor Agreement before making a change

Before uploading your first contribution, you will need setup a password and agree to the contribution agreement:

Generate a HTTPS password: https://android-review.googlesource.com/new-password

Agree to the Google Contributor Licenses Agreement: https://android-review.googlesource.com/settings/new-agreement

Getting reviewed

  • After you run repo upload, open r.android.com
  • Sign in into your account (or create one if you do not have one yet)
  • Add an appropriate reviewer (use git log to find who did most modifications on the file you are fixing or check the OWNERS file in the project's directory)

Handling binary dependencies

AndroidX uses git to store all the binary Gradle dependencies. They are stored in prebuilts/androidx/internal and prebuilts/androidx/external directories in your checkout. All the dependencies in these directories are also available from google(), jcenter(), or mavenCentral(). We store copies of these dependencies to have hermetic builds. You can pull in a new dependency using our importMaven tool.