summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-29Snap for 10582228 from 7b808218c55a0ffcebf70a49b5a6ec03bd6bb4f5 to ↵aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000android14-mainline-media-releaseAndroid Build Coastguard Worker
mainline-media-release Change-Id: I7455b08a79cda2bc3029e61b575936f25b2dde32
2023-07-26DO NOT MERGE: Drop prebuilt files to android source tree. am: fefad393c9Katya Bychkouskaya
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/24199570 Change-Id: I8ab3ceb43883bd96999bec62d31600f7513801a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25DO NOT MERGE: Drop prebuilt files to android source tree.Katya Bychkouskaya
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/licenses/build/soong/licenses/LICENSE current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1007458 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 292505694 Change-Id: Ibc9db48ec9c8b6d0f13991ee29c8a075809ab29f
2023-07-25DO NOT MERGE: Drop prebuilt files to android source tree. am: cac0749523Paul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/24151266 Change-Id: Id17c4f07cb706c26e3d639f769dec33934be5750 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21DO NOT MERGE: Drop prebuilt files to android source tree.Paul Duffin
The following files have been updated as part of this change: go/current/Android.bp go/current/snapshot-creation-build-number.txt go/current/licenses/build/soong/licenses/LICENSE go/current/sdk_library/public/framework-mediaprovider-removed.txt go/current/sdk_library/public/framework-mediaprovider-stubs.jar go/current/sdk_library/public/framework-mediaprovider.srcjar go/current/sdk_library/public/framework-mediaprovider.txt go/current/sdk_library/public/framework-mediaprovider_annotations.zip go/current/sdk_library/module-lib/framework-mediaprovider-removed.txt go/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar go/current/sdk_library/module-lib/framework-mediaprovider.srcjar go/current/sdk_library/module-lib/framework-mediaprovider.txt go/current/sdk_library/module-lib/framework-mediaprovider_annotations.zip go/current/sdk_library/system/framework-mediaprovider-removed.txt go/current/sdk_library/system/framework-mediaprovider-stubs.jar go/current/sdk_library/system/framework-mediaprovider.srcjar go/current/sdk_library/system/framework-mediaprovider.txt go/current/sdk_library/system/framework-mediaprovider_annotations.zip go/current/hiddenapi/annotation-flags.csv go/current/hiddenapi/filtered-flags.csv go/current/hiddenapi/filtered-stub-flags.csv go/current/hiddenapi/hiddenapi-max-target-o-low-priority.txt go/current/hiddenapi/index.csv go/current/hiddenapi/metadata.csv go/current/hiddenapi/signature-patterns.csv go/current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml Built here: ab/T1007188 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 289303031 Change-Id: Iab57707a2112457b78a652efcf0df46d6755fb0c
2023-07-20Snap for 10531979 from 4c613c28bed03fbcd4304ebacc926bb710d9993c to ↵aml_med_340922010Android Build Coastguard Worker
mainline-media-release Change-Id: Iaa4992277db1002586b6f144f168abe68b174e21
2023-07-17Finalize artifacts for extension SDK 8Gurpreet Singh
Import from build id 10504858. Generated with: $ packages/modules/common/tools/finalize_sdk.py -f 8 -b 290366486 -r 'Finalized in July 2023 between U and V (adservices, mediaprovider)' -m com.google.android.adservices -m com.google.android.mediaprovider 10504858 Bug: 290366486 Test: presubmit Change-Id: I8c15d2e0a05b6674ce0a6f25d7ea67cf20d3b456
2023-07-14Snap for 10499713 from 68a600b7905bd27bb75081aaa50734df47dc0ee6 to ↵Android Build Coastguard Worker
mainline-media-release Change-Id: I775374558552bc1d2275e81192350f71ba92379d
2023-07-13DO NOT MERGE: Drop prebuilt files to android source tree. am: 3526009cd8Katya Bychkouskaya
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/24055428 Change-Id: I6a419f88036b23f56604c118155019cbe1b1a8de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13DO NOT MERGE: Drop prebuilt files to android source tree.Katya Bychkouskaya
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/licenses/build/soong/licenses/LICENSE current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1007284 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 285888783 Change-Id: Ia9d3d54859156961720cafd4679e43361148074c
2023-07-13Merge "Revert "Finalize artifacts for extension SDK 8"" into udc-mainline-prodGurpreet Singh
2023-07-12[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Marielos Guerra
tree. am: 77662ad338 -s ours am: 1f30e3c4fb -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/23518380 Change-Id: Ib8e2ed9995b3791c2fea9bb82974705452a7fb60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Marielos Guerra
tree. am: 77662ad338 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/23518380 Change-Id: I1eadd29aeb80ecd489e4d21b339f8accc359c2dd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Revert "Finalize artifacts for extension SDK 8"Gurpreet Singh
Revert submission 23984964-ext-v8 Reason for revert: Adservices API surface has changed. Hence, need to re-do the finalization with the new API surface. Reverted changes: /q/submissionid:23984964-ext-v8 Change-Id: I14a243aca47771ed002b55299ceef6e0fa22a8bc
2023-07-11Snap for 10475946 from aacdf6b02714001bbe75b67697b29c02d624c462 to ↵Android Build Coastguard Worker
mainline-media-release Change-Id: I41e5da8f66969434b894042cfaf88804ce137e99
2023-07-07Finalize artifacts for extension SDK 8Gurpreet Singh
Import from build id 10453938. Generated with: $ packages/modules/common/tools/finalize_sdk.py -f 8 -b 290366486 -r 'Finalized in July 2023 after U and V (adservices, extservices, mediaprovider)' -m com.google.android.adservices -m com.google.android.mediaprovider 10453938 Bug: 290366486 Test: presubmit Change-Id: I527fb7e1dd5f72eb208eb595b891552c750ed3c9
2023-07-07Snap for 10453563 from 6eaf54c739ddb5f2df421b05b45525e0a2984fbb to ↵Android Build Coastguard Worker
mainline-media-release Change-Id: I1ba0badec052eee309447b959833d68742227387
2023-06-23DO NOT MERGE: Drop prebuilt files to android source tree. am: f1f01f1999Katya Bychkouskaya
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/23769939 Change-Id: I7134bc4842cb6ad1c3c634ea2346e6656d885002 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-23DO NOT MERGE: Drop prebuilt files to android source tree.Katya Bychkouskaya
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/licenses/build/soong/licenses/LICENSE current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1007089 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 285888783 Change-Id: I45fe577163b6f80aeba04c6f3975bfb7797170da
2023-06-01DO NOT MERGE: Drop prebuilt files to android source tree.Marielos Guerra
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/licenses/build/soong/licenses/LICENSE current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip Built here: ab/T1006563 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 272106880 Change-Id: Idd324a74fae2298508cf09628100515ffbba3fcb
2023-04-21Finalize artifacts for extension SDK 7 am: ff5c2cec4dAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22756306 Change-Id: I6549ca142547fb9950f506f8237c23a3846181be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20Finalize artifacts for extension SDK 7android14-devAlex Buynytskyy
Import from build id 9975230. Generated with: $ packages/modules/common/tools/finalize_sdk.py -r '- 7: Finalized together with Android {args.finalize_sdk} (all modules)' -b 275409981 -f 7 9975230 Bug: 275409981 Test: presubmit Change-Id: I3f93aa261ee2ce71c418621e3e4f9fdf42ad363c
2023-04-18Revert "Finalize artifacts for extension SDK 7" am: f5674e8f2bAlex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22697707 Change-Id: Id4556eaf58bc254412381d3904bb0d8fe6c8e5c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18Revert "Finalize artifacts for extension SDK 7"Alex Buynytskyy
Revert submission 22648972-finalize-7 Reason for revert: missing SDK extension cl (?) Reverted changes: /q/submissionid:22648972-finalize-7 Change-Id: Ic08a30663984169d5c1c31faec4a5b67bd247d9d
2023-04-15Finalize artifacts for extension SDK 7 am: 33fb5a1728Alex Buynytskyy
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22648971 Change-Id: I932144b80f74590880432b22dfaf0278fed4b544 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-14Finalize artifacts for extension SDK 7Alex Buynytskyy
Import from build id 9942235. Generated with: $ packages/modules/common/tools/finalize_sdk.py -r '- 7: Finalized together with Android {args.finalize_sdk} (all modules)' -b 275409981 -f 7 9942235 Bug: 275409981 Test: presubmit Change-Id: I5016089efd2b28faf98c2861342cdb1955cc151e
2023-03-23[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Bob Hanji
tree. am: efc4eebbc5 am: 3a4098df2d -s ours am: 655a9bc6be -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22129934 Change-Id: Ic67ecc253aaa76ee22aa354912136a960354683c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Bob Hanji
tree. am: efc4eebbc5 am: 3a4098df2d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22129934 Change-Id: I2b30c77c08671935a8e0e661c12b3f3ed33ce283 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-23DO NOT MERGE: Drop prebuilt files to android source tree. am: efc4eebbc5Bob Hanji
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/22129934 Change-Id: Ic7b5d3f3f6b603607ff00a613c1c77639b807e54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17DO NOT MERGE: Drop prebuilt files to android source tree.android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseBob Hanji
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/licenses/build/soong/licenses/LICENSE current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1005628 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 269790979 Change-Id: Ieee7f5d6973f9a00a134157e06d9a2746d130bf6
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: b84ffad880 -s ours am: ↵Xin Li
cd0eb7e8f5 -s ours am: 9276eac2e1 -s ours am: bcd00fa40e -s ours am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 26cb519e1b is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/2487228 Change-Id: Id023762758db6e9597deba19e5f5589758c5e2df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: b84ffad880 -s ours am: ↵Xin Li
cd0eb7e8f5 -s ours am: 9276eac2e1 -s ours am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 26cb519e1b is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/2487228 Change-Id: Ic34b80a1b3ac765c384d0b8d58ebcd1edddb1229 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: b84ffad880 -s ours am: ↵Xin Li
cd0eb7e8f5 -s ours am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 26cb519e1b is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/2487228 Change-Id: I1acf2a81433f7c4657bf2a2f4e50593eed417272 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: b84ffad880 -s oursXin Li
am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 26cb519e1b is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/2487228 Change-Id: Ia08d4741a42ff2a3c413b6369a79ab8bf9691160 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: Iae8ada71947ade0dc5f3684ce3aba94782c19f6e Change-Id: If155c000d872bb87e1e6441d17cfb2cb7e9a5c07
2023-03-13[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Paul Duffin
tree. am: 3fc41df9eb am: b8a038010b -s ours am: 853c7c2219 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/21701420 Change-Id: I3a3a421f40f1e4bbae49ddcffc31fe056190209e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13[automerger skipped] DO NOT MERGE: Drop prebuilt files to android source ↵Paul Duffin
tree. am: 3fc41df9eb am: b8a038010b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/21701420 Change-Id: I6f10dd1a21c8ceb9f69b7c5153784a7ba3758a4e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13DO NOT MERGE: Drop prebuilt files to android source tree. am: 3fc41df9ebPaul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/21701420 Change-Id: Ie2c144272d5c0062f53674b214de09ae7c1e7cb5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02DO NOT MERGE: Drop prebuilt files to android source tree.Paul Duffin
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/licenses/build/soong/licenses/LICENSE current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml Built here: ab/T1005032 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 241324121 Change-Id: Ib7df1b6722547fc10cf1f475fb0f477af0cf32bd
2023-02-15[automerger skipped] Merge TQ2A.230305.008 am: bb8248c8f7 -s ours am: ↵Xin Li
952ffdfb78 -s ours am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 43fefba219 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/21429485 Change-Id: I9f1dd1796daa91f8ab88cb26b9e155e14aea06fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15[automerger skipped] Merge TQ2A.230305.008 am: bb8248c8f7 -s oursXin Li
am skip reason: Merged-In Iae8ada71947ade0dc5f3684ce3aba94782c19f6e with SHA-1 43fefba219 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/21429485 Change-Id: I3df5260a4a4d382095404124603eeef8cf99c48e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14Merge TQ2A.230305.008temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: Iae8ada71947ade0dc5f3684ce3aba94782c19f6e Change-Id: Iad653542c4f211a7ceb96be5234af6c4089beccb
2023-02-06Drop prebuilt files to android source tree. am: 43fefba219 am: 4dd1274fb2Bob Hanji
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/20907886 Change-Id: I1e44f5d8047d01f829fa234d5c04bcdbe9cff18e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06Drop prebuilt files to android source tree. am: 43fefba219Bob Hanji
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/20907886 Change-Id: Ic1b756b76b9b5e3b043167cd2250c8387d4c7332 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-04Merge cherrypicks of ['googleplex-android-review.googlesource.com/20907886'] ↵android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseAndroid Build Coastguard Worker
into tm-qpr2-release. Change-Id: I3ee6a4fc5f18e8dabc172c6b13bc53969750165a
2023-02-04Drop prebuilt files to android source tree.Bob Hanji
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/licenses/build/soong/licenses/LICENSE current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1005166 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 263438687 Change-Id: Iae8ada71947ade0dc5f3684ce3aba94782c19f6e (cherry picked from commit 43fefba219da154a2d68d7ef5370089ed3327b46) Merged-In: Iae8ada71947ade0dc5f3684ce3aba94782c19f6e
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
432953a076 -s ours am: e9341b8cf2 -s ours am skip reason: Merged-In Ifd83cdd42e95e538609d1fede42eb20dea0c9382 with SHA-1 e20ac07740 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/20956803 Change-Id: I296f123b3d0c56518eadf68399e30dca76a44fa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
432953a076 -s ours am skip reason: Merged-In Ifd83cdd42e95e538609d1fede42eb20dea0c9382 with SHA-1 e20ac07740 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/MediaProvider/+/20956803 Change-Id: I51e00011d8a259c3e59c4e84368a9cff855fd3d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: Ifd83cdd42e95e538609d1fede42eb20dea0c9382 Change-Id: I28335d43d2ad2d348b7832cab7593960426b8ecf
2023-01-09Drop prebuilt files to android source tree.Bob Hanji
The following files have been updated as part of this change: current/Android.bp current/snapshot-creation-build-number.txt current/sdk_library/module-lib/framework-mediaprovider-removed.txt current/sdk_library/module-lib/framework-mediaprovider-stubs.jar current/sdk_library/module-lib/framework-mediaprovider.srcjar current/sdk_library/module-lib/framework-mediaprovider.txt current/sdk_library/module-lib/framework-mediaprovider_annotations.zip current/sdk_library/system/framework-mediaprovider-removed.txt current/sdk_library/system/framework-mediaprovider-stubs.jar current/sdk_library/system/framework-mediaprovider.srcjar current/sdk_library/system/framework-mediaprovider.txt current/sdk_library/system/framework-mediaprovider_annotations.zip current/sdk_library/public/framework-mediaprovider-removed.txt current/sdk_library/public/framework-mediaprovider-stubs.jar current/sdk_library/public/framework-mediaprovider.srcjar current/sdk_library/public/framework-mediaprovider.txt current/sdk_library/public/framework-mediaprovider_annotations.zip current/compat_configs/media-provider-platform-compat-config/media-provider-platform-compat-config_meta.xml current/licenses/build/soong/licenses/LICENSE current/hiddenapi/annotation-flags.csv current/hiddenapi/filtered-flags.csv current/hiddenapi/filtered-stub-flags.csv current/hiddenapi/hiddenapi-max-target-o-low-priority.txt current/hiddenapi/index.csv current/hiddenapi/metadata.csv current/hiddenapi/signature-patterns.csv Built here: ab/T1005166 This build IS suitable for public release. The change is generated with prebuilt drop tool. Test: presubmit Bug: 263438687 Change-Id: Iae8ada71947ade0dc5f3684ce3aba94782c19f6e