summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-15[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: d9c00e2457 -s ours am: c6a769d07b -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085842 Change-Id: I588c2a8d827f7e1b273d7824d64aee7f218c7c1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into rvc-qpr-dev am: 720d8be538 -s ours am: 410826b46c -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085842 Change-Id: I4446ce946f408944f951d0ce68bf3effa9aab7e7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: d9c00e2457 -s ours am: c6a769d07b -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085842 Change-Id: I7cc951eba9425ca88221a6e9e41ae40bbe37b03b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into rvc-qpr-dev am: 720d8be538 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085842 Change-Id: I3adf3196998b523e8f71c059e166e86094907a9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: d9c00e2457 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085842 Change-Id: Ic3bef5764122ccadb5cadb4fd5470de553182473 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into ↵TreeHugger Robot
rvc-qpr-dev
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I608fc562e20df6e75fbddd73289b153fe9e55cc5
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: f2685f2bf0 -s ours am: 1eddec9841 -s ours am: fb04c4faf8 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 13e6a6fb58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I3adcd08196be14647032cc1d1d19121c111eb626 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-qpr1-dev am: dd44399179 -s ours am: 24bbc4cad9 -s ours am: b92c43ab5d -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: I6971ea815b55fb2b488d4cfdbb8a0bd29cc5991b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: 13e6a6fb58 -s ours am: 3ada49c9f8 -s ours am: c679f052f3 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: Ia8b0d9edd6d00e772d31f331bf7d1363cb81b358 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-qpr1-dev am: 1bd31334c6 -s ours am: 1f8f5fe28d -s ours am: f1c3fae66a -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: Ib4aba2794e208c7e8df03745cc2ee4970301383f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] [automerge] isDataOrObbPath blocks access to ↵Abhijeet Kaur
Android/[data|obb] dirs only 2p: bb4ec053ea am: 8d612ee31f -s ours am: b0b552830d -s ours am: d280b25b2f -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I0d255ff87e144fd687322bdf57bb2695b7b889d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: 343ffc0a45 -s ours am: 75b62c4607 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I61378844ac563a32812fa8f3399c8954b12b28eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-mainline-prod am: 6feb011ba7 -s ours am: 97a1ed2932 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I6ab3e08200642203a7b5e00b52c36e5b56cc1440 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: f2685f2bf0 -s ours am: 1eddec9841 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 13e6a6fb58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I4895724f6aeb56881246a0654f2278dcdabcc20a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-qpr1-dev am: dd44399179 -s ours am: 24bbc4cad9 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: I827aa8e03b9832f9549ae9ef835cd77406897828 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: 13e6a6fb58 -s ours am: 3ada49c9f8 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: I20b12395e2401720914e3cafbbc4f46f7ea10f24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-qpr1-dev am: 1bd31334c6 -s ours am: 1f8f5fe28d -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I88d17e949cbdcc7b3801df753bdc30de385c44c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] [automerge] isDataOrObbPath blocks access to ↵Abhijeet Kaur
Android/[data|obb] dirs only 2p: bb4ec053ea am: 8d612ee31f -s ours am: b0b552830d -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I42376ac5996fa5509980e48b64474655cbecc1b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: f2685f2bf0 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 13e6a6fb58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I1ead6aabc156e99d854f6b6d25b1cfab537640a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-qpr1-dev am: dd44399179 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: I62bf789784eedf803c9ef2b8807a04e79fb87cfe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: 13e6a6fb58 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085839 Change-Id: If16df456b5ca6501cb1fb796d62810480a0eec4d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am: 343ffc0a45 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: Ibbf9e9e3c91f0198d78db8f9452727afd22c615f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-mainline-prod am: 6feb011ba7 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I676a72fa40a0f09b819592b70e614335b6c1bfdc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-qpr1-dev am: 1bd31334c6 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I5affaa1ed3367ae27d6fb8e92c65361e703c16d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] [automerge] isDataOrObbPath blocks access to ↵Abhijeet Kaur
Android/[data|obb] dirs only 2p: bb4ec053ea am: 8d612ee31f -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 4f46f26267 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I906730e84f85686fe08066fb3de6593a7e20b9db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 13e6a6fb58 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: Ie9c99e47067a3c52370e51eb12902319086f7553 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-v2-dev am: 6bdf6bfec0 -s ours am: f610745928 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085840 Change-Id: I224883b4c6e83c34299d89b426e9135fdd2f2ac7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: 4f46f26267 -s ours am: 86f25860b7 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085840 Change-Id: I2bbaba9d651f5efe37199287bbda0ae7a3564ee5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into tm-dev am: fe297a6bb5 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 fe79a43a89 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I49ee477818ea7f9bba72f9ce543685c9d3917eda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] [automerge] isDataOrObbPath blocks access to ↵Abhijeet Kaur
Android/[data|obb] dirs only 2p: bb4ec053ea 2p: 8c3b28e82b am: 748b7bc7e2 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 fe79a43a89 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I0cc1d89ce0ca72ea8b7a9903e85cdf2efd93eb51 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-dev am: ffdfe37d14 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085838 Change-Id: I09ed0f909bb09c070102964879e2a05099d1d1f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] Merge "isDataOrObbPath blocks access to ↵TreeHugger Robot
Android/[data|obb] dirs only" into sc-v2-dev am: 6bdf6bfec0 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085840 Change-Id: I3f89170e81c97f15fd648412303b8af0b20ff219 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14[automerger skipped] isDataOrObbPath blocks access to Android/[data|obb] ↵Abhijeet Kaur
dirs only am: 4f46f26267 -s ours am skip reason: Merged-In I9d73c8c1ed40efb8bc851e9f510d4f7453367308 with SHA-1 bb4ec053ea is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19085840 Change-Id: I9d2396b6b2414ed1ada20b31b4c51741b6ae529a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into ↵TreeHugger Robot
sc-qpr1-dev
2022-07-14Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into ↵TreeHugger Robot
sc-v2-dev
2022-07-14Merge "isDataOrObbPath blocks access to Android/[data|obb] dirs only" into ↵TreeHugger Robot
sc-dev
2022-07-14Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-mainline-prod * changes: [automerge] isDataOrObbPath blocks access to Android/[data|obb] dirs only 2p: bb4ec053ea isDataOrObbPath blocks access to Android/[data|obb] dirs only
2022-07-14Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into sc-qpr1-dev * changes: [automerge] isDataOrObbPath blocks access to Android/[data|obb] dirs only 2p: bb4ec053ea isDataOrObbPath blocks access to Android/[data|obb] dirs only
2022-07-14Merge changes from topic ↵TreeHugger Robot
"presubmit-am-355c0e8e7c35452d92b25e6e1a76eb99-sc-dev" into tm-dev * changes: [automerge] isDataOrObbPath blocks access to Android/[data|obb] dirs only 2p: bb4ec053ea 2p: 8c3b28e82b [automerge] isDataOrObbPath blocks access to Android/[data|obb] dirs only 2p: bb4ec053ea isDataOrObbPath blocks access to Android/[data|obb] dirs only
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I37ce0bc8caf48a6eea6831c3792c86127a3ab107
2022-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ia700c7ea6d59e16a8ec0829ca65c6e2875b4c987
2022-07-13Merge "Fix renameForFuse method in MediaProvider" into tm-mainline-prodShubhi Saxena
2022-07-12Fix renameForFuse method in MediaProviderShubhi
Previously, rename restrictions for secondary volume wasn't imposed correctly, this happened because we used same volume name for both emulated and public volume. Changed the code to extract volume name from the path. Also fixed case insensitivity issue in file path comparison in renameForFuse code. Fixed rename restrictions so that files and packages cannot be moved directly in the media directory outside the package directories. Bug: 177049768 Test: atest ScopedStorageDeviceTest#testRenameFileToExternalDir Change-Id: If9f9b597dab01895fbb570e3b0e9db4626ee230e
2022-07-12Make change and version bump to aml_go_mpr_330911000 for mainline module ↵Android Build Coastguard Worker
file: apex/apex_manifest.json Change-Id: Iea12d130cfd1cb581ecfd7d68ddc9806c59db9ad
2022-07-12Merge "Setting apex version to the placeholder value" into tm-mainline-prodAlexei Nicoara
2022-07-11Make change and version bump to aml_go_mpr_330910000 for mainline module ↵Android Build Coastguard Worker
file: apex/apex_manifest.json Change-Id: I886571fb41cc962859cd01737023dae4156a8e95
2022-07-11[automerger skipped] DO NOT MERGE Avoid path traversal in MediaProvider ↵Dipankar Bhardwaj
delete call am: 9af1c783ee am: 13c1dfd91f -s ours am: fa4a51ae23 -s ours am: 4739d294a8 -s ours am: fd4a7ced68 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/18770135 Change-Id: Iad37e8912292d821876bdd390ce1d0b9a792434c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11[automerger skipped] Merge "DO NOT MERGE Avoid path traversal in ↵TreeHugger Robot
MediaProvider delete call" into sc-dev am: 39d7dcccd4 am: 8782fa365d -s ours am: 03445e0091 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/18770133 Change-Id: I93d57c20607694c3cd7317ed98443efe1e4509f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-11[automerger skipped] [conflict] DO NOT MERGE Avoid path traversal in ↵Dipankar Bhardwaj
MediaProvider delete call am: 47767be45f am: 0d7074e1d1 -s ours am: dc5ff48205 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/19198938 Change-Id: Ifca6f79becd5e7b838822189ea3eaf75db216344 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-07-10 18:00:22 +0000