summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-01Snap for 10594898 from 7b180e35771b0e91547e5a1791a65d7d641d5d88 to ↵android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseAndroid Build Coastguard Worker
udc-d1-release Change-Id: I4f1e6d0ff81afda696e4c4811d5e52aa6723dd30
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am: 2cb5509b8f -s ours am: fbbe04d6d4 -s ours am: ae7a7c355c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I135e2bd57f235ef23d3d9196d40648a48e459eb6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am: 12fab43d82 -s ours am: 39f00c94c7 -s ours am: b39c44ece3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: Ieb0cefafcf4f6734fb74dbc770d20f012450426f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am: 2cb5509b8f -s ours am: fbbe04d6d4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I5fd00f90050508e2f81951b611edc60f0842ce84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am: 12fab43d82 -s ours am: 39f00c94c7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: I140936259e15b7e7dccd0cb03eb6755be80783a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am: a1aa87f7bc -s ours am: 6def2f46a1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I3d5e6eb0225f626c4a3ecfa0b5e71dbd2a0c2505 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am: 3e5a682d98 -s ours am: 1a77521a91 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: I9a86af032b60d9a673dcd0925be80804564eb807 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am: a1aa87f7bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: Ic32be880ef7fedca91d289b679a92f14cb4fa6fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am: 3e5a682d98 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: I7691f6128d37e843ee1b438b4dc965822487b613 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am: 2cb5509b8f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I071600426ca6f9b8840e82d31d535d191f0cb54c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am: 12fab43d82 -s ours am skip reason: skipped by user sergeynv Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: I6f8565e6d68cbdf2f1c398621a8608eba421cdc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I2cfc393a183a4de663034307f49720c96b213efe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am skip reason: skipped by user sergeynv Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: Id896d61bd91c84117cc308421ac7ba8076ea235b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am: 3f1934ff36 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I4e05275adc190cb274bf9a8f95f51bc3f333a344 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-01[automerger skipped] [DO NOT MERGE][resolved conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: c934d394d3 am: 9d054a9eb6 -s ours am skip reason: skipped by user sergeynv Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24246851 Change-Id: Iaed6d38c941b2df5369170b71c844dd06b6b6652 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am: bf766a3310 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I3263f4292f5bb8889303c48d5274cd35d07ebc84 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31[DO NOT MERGE][resolved conflict] Fix path traversal vulnerabilities in ↵Sergey Nikolaienkov
MediaProvider am: c934d394d3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23029977 Bug: 293693546 Change-Id: I02d13498ef0f38fc7cec3c73f847d11241a74dae Merged-In: I61e77d69ae857984b819fa0ea27bec5c26a34842 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31[automerger skipped] [DO NOT MERGE][conflict] Fix path traversal ↵Sergey Nikolaienkov
vulnerabilities in MediaProvider am: 5d2808f30c am: 890c220827 am: 20f1de480d am: 41903182a3 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I7263a4be53679d6279f50d25f08bc405ea72653f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31[DO NOT MERGE][conflict] Fix path traversal vulnerabilities in MediaProvider ↵Sergey Nikolaienkov
am: 5d2808f30c am: 890c220827 am: 20f1de480d Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24256322 Change-Id: I4c1be20bbf0b4fcf129ad126f9611e74b28d25b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-29Snap for 10582327 from 7c3644c2afc13053bd6bd70950d9ce488924b19e to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ibcd7b5c18938011032d7d4a0af15033b7ac77410
2023-07-29[DO NOT MERGE][conflict] Fix path traversal vulnerabilities in MediaProvider ↵Sergey Nikolaienkov
am: 5d2808f30c am: 890c220827 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23025747 Bug: 293699308 Change-Id: I20aca5d4ad76568cd592192756c9eff5c39c62b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-29Fix path traversal vulnerabilities in MediaProvider am: 5d2808f30cSergey Nikolaienkov
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23025747 Change-Id: I01bd58f96a74201f6bf1da7397fff2f3eaaf3b3a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-29Snap for 10580647 from a612833f13b00fc3384740d62ea2c03fb92a5e1c to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: If8a02a66395b486f2781b5c5e2b059a407c882cb
2023-07-28[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵Treehugger Robot
udc-dev am: 8f7283502a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217026 Change-Id: Ic8e67cc00efea7c11920c2ead96f6d0c3e644c1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
2be2293381 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217026 Change-Id: I9c0ed366628c70bd92c58a37d311eb39e039e43a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-devTreehugger Robot
2023-07-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
98cc0eabec -s ours am: 463029b062 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217025 Change-Id: I22804d2f30c776a4d8f08eeaab90370f350adfaa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
98cc0eabec -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217025 Change-Id: I5815667c44fbd95bbde11d3c049c4407e6fd47fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Snap for 10573380 from 781c5c759f5530c7b7e10f6ce154d8062e8fbbff to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I7a27754ab4bf29bf80ee465a4427981449f4e6af
2023-07-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3e5024dbf1 -s ours am: 8f8c817f0f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217027 Change-Id: I207b440596f33eade66047b827a55a09dcee3ba0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
3e5024dbf1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24217027 Change-Id: Icd712f543b880cd9d7200c1e1e946c4279ca27f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-devTreehugger Robot
2023-07-27Fix path traversal vulnerabilities in MediaProviderSergey Nikolaienkov
Canonicalize filepath provided by the caller when hanling SCAN_FILE_CALL method call in MediaProvider. Additionally, make sure to check access permission in SCAN_FILE_CALL (using enforceCallingPermissionInternal()). Preemptively canonicalize Files provided as an arguments to the public API methods in ModernMediaScanner (scanFile(), scanDirectory() and onDirectoryDirty()) to prevent path traversal attacks. Bug: 262244882 Test: atest MediaProviderTests Change-Id: I61e77d69ae857984b819fa0ea27bec5c26a34842 Merged-In: I61e77d69ae857984b819fa0ea27bec5c26a34842 Merged-In: I1d75bc219ff07bb00e79e45a722d39b478c264de
2023-07-27Fix path traversal vulnerabilities in MediaProviderSergey Nikolaienkov
Canonicalize filepath provided by the caller when hanling SCAN_FILE_CALL method call in MediaProvider. Additionally, make sure to check access permission in SCAN_FILE_CALL (using enforceCallingPermissionInternal()). Preemptively canonicalize Files provided as an arguments to the public API methods in ModernMediaScanner (scanFile(), scanDirectory() and onDirectoryDirty()) to prevent path traversal attacks. Bug: 262244882 Test: atest MediaProviderTests Change-Id: I61e77d69ae857984b819fa0ea27bec5c26a34842 Merged-In: I61e77d69ae857984b819fa0ea27bec5c26a34842 Merged-In: I1d75bc219ff07bb00e79e45a722d39b478c264de
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2a7f7c7eff64303dfc40e8c46469c6ac02f7595b
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I422d2c3ae192a1b3824f2e573ab0df7dea540b6c
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Iaa30280d8994b3db0b1af876b924c2540ea79eba
2023-07-26Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia27898b6cc417b7afa763137b5774a38c6ba948c
2023-07-26Snap for 10566258 from ee0787c7ae00bc74f93de40610e444ba3f56bcf1 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I91924e3fade3e0fb2111ea4a4485433137563f47
2023-07-26Fix path traversal vulnerabilities in MediaProvider am: 4c86776408Sergey Nikolaienkov
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/24079606 Change-Id: Ia3842365b38400df7ed08fbe20128b6e78f24a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-24Snap for 10551705 from 1e6eb40409e6ecac22cc515f172f349e4514e302 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ic2e2f5235a7ff7c6c77834bbf50c74a77c0fba69
2023-07-24Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I610fd57c7caa7ae362ec8c4afbade24f28248fd2
2023-07-17Fix path traversal vulnerabilities in MediaProviderSergey Nikolaienkov
Canonicalize filepath provided by the caller when hanling SCAN_FILE_CALL method call in MediaProvider. Additionally, make sure to check access permission in SCAN_FILE_CALL (using enforceCallingPermissionInternal()). Preemptively canonicalize Files provided as an arguments to the public API methods in ModernMediaScanner (scanFile(), scanDirectory() and onDirectoryDirty()) to prevent path traversal attacks. Bug: 262244882 Test: atest MediaProviderTests Merged-In: I61e77d69ae857984b819fa0ea27bec5c26a34842 Merged-In: I1d75bc219ff07bb00e79e45a722d39b478c264de Change-Id: I61e77d69ae857984b819fa0ea27bec5c26a34842
2023-07-12Snap for 10486914 from 9008437cb34b524456292990ba2f726c9a08d6a4 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: Ia12f7f3858b2e4fb24a16cd01fb38986df137186
2023-07-12Fix transaction deadlock am: c1d740cf6fDipankar Bhardwaj
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23877583 Change-Id: I52b930886d499230701475df39bd1d45614689ef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Fix transaction deadlockDipankar Bhardwaj
There are 2 db files. One is external.db and the other is picker.db. Unfortunately, in order to update value of special format column, MediaProvider obtains external.db's transaction first and then tries to obtain picker.db's transaction repeatly. On the other hand, for sync, PickerSyncController obtains picker.db's transaction first and then tries to obtain external.db's transaction. If these two events happen concurrently, a deadlock is likely to occur. Bug: 288360394 Test: atest MediaProviderTest Change-Id: Iea90b46147240e1baf0e53b13c2124dac3281691 Merged-In: Iea90b46147240e1baf0e53b13c2124dac3281691
2023-07-11Snap for 10478082 from a4fffacf49514641fe2f33ef0e0b489e166d1223 to ↵Android Build Coastguard Worker
udc-d1-release Change-Id: I7317e5786f7a53e8d2e38a5474267b22b3e39193
2023-07-10Canonicalize file path for insertion by legacy apps am: 3c0f583f5d am: ↵Dipankar Bhardwaj
2f1379e761 am: 5d3f197962 am: f1346125db am: 7cd1b2bc25 am: 0bf2b87c73 am: cd65cb0476 am: 23408a19ad am: 48d5106128 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23916075 Change-Id: I015ad572556a420334616c9510e71726be8e8468 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Canonicalize file path for insertion by legacy apps am: 3c0f583f5d am: ↵Dipankar Bhardwaj
2f1379e761 am: 5d3f197962 am: f1346125db am: 7cd1b2bc25 am: 0bf2b87c73 am: f6530a302f am: 0fdca29cf1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23916075 Change-Id: I54ab0cc6c14ff7cf9639047062f3655243f5ad7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Canonicalize file path for insertion by legacy apps am: 3c0f583f5d am: ↵Dipankar Bhardwaj
2f1379e761 am: 5d3f197962 am: f1346125db am: 7cd1b2bc25 am: 0bf2b87c73 am: cd65cb0476 am: 23408a19ad Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/23916075 Change-Id: I23ba0d87b360e4b0ae36419efda8df9c5fccc784 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>