summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
4 daysMerge "RESTRICT AUTOMERGE Set the container field of aconfig flags" into mainHEADmastermainOriol Prieto Gascó
5 daysRESTRICT AUTOMERGEOriol Prieto Gasco
Set the container field of aconfig flags Test: printflags --format='{package}:{container}:' | grep "::" Bug: 312769710 Flag: NONE Change-Id: If9f4a073261a036352f44a01e30f58dc8827117c
2024-03-18Merge "Fix UnnecessaryCheckNotNull errorprone issue" into mainCole Faust
2024-03-12Fix UnnecessaryCheckNotNull errorprone issueCole Faust
`action` is a primitive int, it cannot be null. Bug: 253827323 Test: Presubmits Change-Id: Ia16ffe8d3f366fd751c9ee3e04cca61271c03688
2024-03-07Merge "Merge Android 14 QPR2 to AOSP main" into mainXin Li
2024-03-06Merge Android 14 QPR2 to AOSP mainXin Li
Bug: 319669529 Merged-In: I976a4f1b0924d28f70e103d327dc8921ec1115b4 Change-Id: I4e734a4eac294f82dcac9cd44f1e91160520ad68
2024-02-23Merge changes from topic "dir_fix" into main am: e2a69a047etemp_319669529Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2886331 Change-Id: I976a4f1b0924d28f70e103d327dc8921ec1115b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23[automerger skipped] Correctly handle non-NULL terminated fuse_dirents am: ↵Paul Lawrence
0c4d487458 -s ours am skip reason: Merged-In I6397f368d295891b935e974858733b46e84218ff with SHA-1 aaff0c83a1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2886330 Change-Id: I00f21114fd436c491b7e47e30f37ffa466624273 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23Merge changes from topic "dir_fix" into mainTreehugger Robot
* changes: Use updated headers in libfuse Correctly handle non-NULL terminated fuse_dirents Fix fuse-bpf can lead to folders not be viewable erroneously
2024-02-23Use updated headers in libfusePaul Lawrence
Size field is no longer needed by the kernel Bug: 316860292 Test: Can create 200 dirs in /storage/emulated/0/Android/data atest ScopedStorageDeviceTest passes Change-Id: I097493bd8ce5c4fbff535922844a9416fad16466 Merged-In: I097493bd8ce5c4fbff535922844a9416fad16466
2024-02-23Correctly handle non-NULL terminated fuse_direntsPaul Lawrence
Bug: 297092865 Test: Entries appear correctly in storage/emulated/0/Android/data Change-Id: I6397f368d295891b935e974858733b46e84218ff Merged-In: I6397f368d295891b935e974858733b46e84218ff
2024-02-23Fix fuse-bpf can lead to folders not be viewable erroneouslyPaul Lawrence
As reported by Mao Wang <maow@qti.qualcomm.com>, we must not assume dirents are zero terminated Bug: 290657703 Test: fuse-bpf is still running, still hiding directories correctly Change-Id: If78c43d4c822e0222aaf78aa5c8153f724503524 Merged-In: If78c43d4c822e0222aaf78aa5c8153f724503524
2024-02-22Merge "Add SDK library framework-pdf-v in MediaProvider" into main am: ↵Nishant Panwar
85008855ce Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2957572 Change-Id: I81a16685c4d91146a770cf025f91f179ac66b3a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22Merge "Add SDK library framework-pdf-v in MediaProvider" into mainNishant Panwar
2024-02-21Merge "Added pdf owners for pdf/ in MediaProvider" into main am: def9c175ccNishant Panwar
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2971173 Change-Id: I572f3aaabb88cda4229186098d69c2d3660464f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-21Merge "Added pdf owners for pdf/ in MediaProvider" into mainNishant Panwar
2024-02-21Added pdf owners for pdf/ in MediaProviderNishant Panwar
Bug: NA Test: NA Change-Id: I99611b4c0125e3bbc7a9fb65e6cf08ffa5269b17
2024-02-21Add SDK library framework-pdf-v in MediaProviderNishant Panwar
SDK library for pdf related bootclasspath classes that were part of the non-updatable API before V, and were moved to the module in V. Other pdf related bootclasspath classes in mediaprovider should go to framework-pdf. Bug: b/324667310 Test: presubmit and m Change-Id: I93574a7546f09590090872ae43425ea32405bab2
2024-02-19Fix picker sync worker testsKrishang Garodia
The picker sync worker tests are updated to get an instance of the Workers using the public TestWorkerBuilder lib instead of the private Worker constructor. Test: atest MediaProviderTests Bug: 325099689 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dcc33f3d3c9da9591755079ddc7a463cc62579aa) Merged-In: I903bad9001f73c7a87f0bd46c199396213494c64 Change-Id: I903bad9001f73c7a87f0bd46c199396213494c64
2024-01-26Merge Android 24Q1 Release (ab/11220357)Xin Li
Bug: 319669529 Merged-In: Id98d1ea9ea7d63cbeece73e59f36fdc3c7d561e0 Change-Id: Icb0cdfade56f7cff95bbd7b0ed5fa0fbdf84a72a
2024-01-26Merge "Remove java_api_contribution modules from .bp files" into main am: ↵Jihoon Kang
70793e919c Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2927230 Change-Id: I6bd14fd83cbc45a0d60b26c179f9f4cc4191a76c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-26Merge "Remove java_api_contribution modules from .bp files" into mainJihoon Kang
2024-01-25Remove java_api_contribution modules from .bp filesJihoon Kang
java_api_contribution modules are dynamically generated from droidstubs modules or java_sdk_library_import, and is not a user-facing module. Defining this module is a .bp file is a no-op. Test: m nothing Bug: 322242515 Merged-In: Idd6c3f66cb02fcc85666bba024b532ca61b431ab Change-Id: Idd6c3f66cb02fcc85666bba024b532ca61b431ab
2024-01-04Merge "Make apex availability of MediaProvider and libfuse_jni explicit" ↵Spandan Das
into main am: 0e8213506c Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2893361 Change-Id: Ia29c915d9483582bb1d7a21f156a3ecc3d28e34c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04Merge "Make apex availability of MediaProvider and libfuse_jni explicit" ↵Spandan Das
into main
2024-01-02Make apex availability of MediaProvider and libfuse_jni explicitSpandan Das
The availability to com.android.mediaprovider was done implicitly using a baseline map in build/soong/apex/apex.go. Make this explicit in Android.bp Bug: 281077552 Test: m nothing Change-Id: I8377a515344814bd0e08dc1669102f456445f4d1
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into ↵Cole Faust
main am: ec6af815a0 Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2886309 Change-Id: Ic8e12fb1e6bc0156dcd20de48748a6f45e52f35a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-21Merge "List baseline_filename on modules that are implititly using it" into mainCole Faust
2023-12-20List baseline_filename on modules that are implititly using itCole Faust
lintable modules currently pick up files named "lint-baseline.xml" to use as the lint baseline implicitly. This is confusing because you could end up using the baseline files in more modules than intended. Lint also has a feature where it requests you remove unnecessary findings from the baseline file, so something could be necessary for one module, but unnecessary for another that accidentally picked up the baseline. We're removing the implicit detection of the baseline file, which requires all modules using it to list the baseline file explicitly. Bug: 272769514 Test: Presubmits Change-Id: I076929168cbcaab1b8c4acb27484694a57b81a72
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 8011db0f64 ↵Xin Li
-s ours am: 18582576af -s ours am: 5f95d51dfb -s ours am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: Iebda3c2f2a8d23d7ed294c46210cd1e336fa2b18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ae28f5b0e5 -s ours am: ↵Xin Li
0120788127 -s ours am: c17cee08d5 -s ours am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: Ifd5cecebaa7cab3ec6b05e6d55f8adf425c3fc87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 8011db0f64 ↵Xin Li
-s ours am: 18582576af -s ours am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: I3bb65431c821e545d0d85a85fb78fa990df8e67e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ae28f5b0e5 -s ours am: ↵Xin Li
0120788127 -s ours am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: I2f2d11c3a9727ad819e2c523d30fc9c8633bf028 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 8011db0f64 ↵Xin Li
-s ours am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: I48ebed8d25add176bff119a8ed7b5f42240a754c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: ae28f5b0e5 -s oursXin Li
am skip reason: Merged-In Id5c5f0bdd69491739a4dccff677265369870a1d7 with SHA-1 8550530592 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2866053 Change-Id: Iff4d14a9ca9ba01cdef8ae376b3a59c168c8b4fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-09Merge "Merge Android 14 QPR1" into mainXin Li
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: Id5c5f0bdd69491739a4dccff677265369870a1d7 Bug: 315507370 Change-Id: Ifbc49810f096c782f3f5907069c91bf751d6d17c
2023-12-07Merge "Add picker sync worker tests" into udc-mainline-prod am: 434f20581aTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25559684 Change-Id: I5f0f9d14756ba5de3475203d708534cc8732aa68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Add picker sync worker tests" into udc-mainline-prodTreehugger Robot
2023-12-07Add picker sync worker testsKrishang Garodia
Test: atest MediaProviderTests Bug: 313504896 Change-Id: Id98d1ea9ea7d63cbeece73e59f36fdc3c7d561e0
2023-12-07[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Bill Yi
udc-mainline-prod am: ba5b8f4e53 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25565235 Change-Id: I550b5f06881cad187a0681f9cba7d12d98b68403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d609aed5b0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25565235 Change-Id: I8b444903162cf74b4df7cab591bb6e845c3a69ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prodBill Yi
2023-12-07Merge "Import translations. DO NOT MERGE ANYWHERE" into mainBill Yi
2023-12-06Merge "Ignore public volume test" into udc-mainline-prod am: e04c62d319Dipankar Bhardwaj
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25559602 Change-Id: Ia24dbde0e51378a6e9190bb0f0ed7553f2602ecb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Merge "Catch crashes in onScanVolume" into udc-mainline-prod am: ↵Automerger Merge Worker
375964fe66" into main
2023-12-06Merge "Catch crashes in onScanVolume" into udc-mainline-prod am: 375964fe66Aleksandr Lukin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25502854 Change-Id: Ia599860908975056c1707e7c9108eb0602406c9d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Enable FUSE_CAP_PARALLEL_DIROPS" into main am: d6886aa1cc am: ↵Keiichi Watanabe
dfb383c802 am: 10fe9e09b1 Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2856969 Change-Id: Icffc8559aa3050b7913653a70f2239abf04587a0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Enable FUSE_CAP_PARALLEL_DIROPS" into main am: d6886aa1cc am: ↵Keiichi Watanabe
8550530592 am: 42e2f2b351 Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2856969 Change-Id: I2460419a5619e480997651721121c804f2ca12aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06Merge "Enable FUSE_CAP_PARALLEL_DIROPS" into main am: d6886aa1cc am: dfb383c802Keiichi Watanabe
Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/2856969 Change-Id: I2e82d12374944ac6a3c89f6dbff33fc092fbfde1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 04:52:57 +0000