summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-30AOSP/Gallery - Deleted "Set As" menu item and ability to ATTACH_DATA. am: ↵temp_sam_236045730Raman Tenneti
0bd4d095a7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/17476306 Change-Id: I00f006f276b0ff5d28bf694165d03408ea338d9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-29AOSP/Gallery - Deleted "Set As" menu item and ability to ATTACH_DATA.Raman Tenneti
Fixes Gallery2 ATTACH_DATA Intent Action Could be Intercepted to Grant Access of Its Own Non-picture Private Files to OutSide. Bug: 201535148 Test: manual + Will attach the test results to the above bug. Change-Id: Ie47945cc3519099cb685a26eee81130c2766be80 (cherry picked from commit 35ab9cd99173079886c3cd636b0606f55fefd846)
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 31d83bc139 -s ours am: ↵Xin Li
a4d61aa0b7 -s ours am skip reason: Merged-In I5a4b1775eb06ead74d360332ef750fc2215378c7 with SHA-1 6a24c90a1b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2013331 Change-Id: Ifea71d8eef53982359112809897b3ceda4957c01
2022-03-08[automerger skipped] Merge Android 12L am: c858de2696 -s ours am: 0dcf50dc83 ↵Xin Li
-s ours am skip reason: Merged-In I5a4b1775eb06ead74d360332ef750fc2215378c7 with SHA-1 6a24c90a1b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2013331 Change-Id: Ide20e7559d21ac00db2b11c8dee7422b40aba4a2
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 31d83bc139 -s oursXin Li
am skip reason: Merged-In I5a4b1775eb06ead74d360332ef750fc2215378c7 with SHA-1 6a24c90a1b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2013331 Change-Id: If9a884aed3eb4da2ce0f68d477b2f400ac058fe4
2022-03-08[automerger skipped] Merge Android 12L am: c858de2696 -s oursXin Li
am skip reason: Merged-In I5a4b1775eb06ead74d360332ef750fc2215378c7 with SHA-1 6a24c90a1b is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2013331 Change-Id: I60e9c69c45cc3523fd0a6583420bf44c3bccc824
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I5a4b1775eb06ead74d360332ef750fc2215378c7 Change-Id: Iad11e8d4a352e93a32ea405cc1eae28f3f1bf540
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
6a24c90a1b -s ours am skip reason: Merged-In I40672a0745ac65549c539da73ebb5b1710fd2821 with SHA-1 5cc923fa21 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/16845268 Change-Id: Ife16627d73f3b6e725876f345d3ff357cc358d01
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I40672a0745ac65549c539da73ebb5b1710fd2821 Change-Id: I5a4b1775eb06ead74d360332ef750fc2215378c7
2022-01-06AOSP/Gallery2 - Disable copying of arbitrary private file of Gallery2 into ↵Raman Tenneti
External Storage. am: 5cc923fa21 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/16570281 Change-Id: Icf7f1953ffff01fa2a0331feb6608f7cc84fb1b0
2022-01-05AOSP/Gallery2 - Disable copying of arbitrary private file of Gallery2 into ↵android12L-devRaman Tenneti
External Storage. + ContentResolver.SCHEME_FILE is a constant defined as "file". A malicious app can use "File:" url to copy private files of Gallery2. Fix is to lowercase the scheme before doing the comparison. Fix: 201535427 Bug: 201535427 Test: manual Change-Id: I40672a0745ac65549c539da73ebb5b1710fd2821 (cherry picked from commit 0acea168f86f938bc99d872a79558b46e4b61c39)
2021-12-20Merge "Gallery2 - set target sdk version to 28." am: e4231e43b5 am: ↵Raman Tenneti
19be019509 am: a7e13d460a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1930620 Change-Id: I2cbd4c9939343898290eae9ef4ff7b79f3ea3882
2021-12-20Merge "Gallery2 - set target sdk version to 28." am: e4231e43b5 am: 19be019509Raman Tenneti
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1930620 Change-Id: Id0e574bd5bb8a50f0fc49ee13ac9e7a035d8bf6d
2021-12-20Merge "Gallery2 - set target sdk version to 28." am: e4231e43b5Raman Tenneti
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1930620 Change-Id: Ie5c19c31103b5738f66a05131135c9dfb6553fdb
2021-12-20Merge "Gallery2 - set target sdk version to 28."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Raman Tenneti
2021-12-20Gallery2 - set target sdk version to 28.Raman Tenneti
Made changes to Android.bp to match versions in AndroidManifest.xml Bug: 209472323 Test: manual Change-Id: Ic54d7a2aa2d33cb0f98ad530a037705e2c146add
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s ours am: ↵Xin Li
6386748dd0 -s ours am: efc19c941c -s ours am: 183e5eecf7 -s ours am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1847444 Change-Id: Ib542db6ce240c3a984413bead67ba7747202a725
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s ours am: ↵Xin Li
6386748dd0 -s ours am: efc19c941c -s ours am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1847444 Change-Id: I06c94c0934220cd04a402b57604b203119bc30d6
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s ours am: ↵Xin Li
6386748dd0 -s ours am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1847444 Change-Id: Ibe86a1f8a7a68a291899cc8a7e0fd562e302bce5
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 6a61f5e26e -s oursXin Li
am skip reason: Merged-In Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 with SHA-1 fbecf384e0 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1847444 Change-Id: Ie3fff13f4a7a14f7d1bd71f94d7ba9225f37ac38
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: Ic0b62464a326d6a7b6afd823414c6c8fd0d67547 Change-Id: Ib6efaff3d74a904678d75922aa91d7824ced594b
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
fbecf384e0 -s ours am: 4e5adba12b -s ours am: b0bcc1f975 -s ours am skip reason: Merged-In If3d36c15e515f85cd778a82be849fe01294b0ef1 with SHA-1 68c4302a23 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/15571777 Change-Id: I77f7564071fd754ab56715b91a5f89787056cacb
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
fbecf384e0 -s ours am: 4e5adba12b -s ours am skip reason: Merged-In If3d36c15e515f85cd778a82be849fe01294b0ef1 with SHA-1 68c4302a23 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/15571777 Change-Id: Iffb81ce795dccf678230d9476f5a2488676a5d3c
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
fbecf384e0 -s ours am skip reason: Merged-In If3d36c15e515f85cd778a82be849fe01294b0ef1 with SHA-1 68c4302a23 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/15571777 Change-Id: I54f4d546ac757a6a27cdcd1f4f41cb5daff4a785
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: If3d36c15e515f85cd778a82be849fe01294b0ef1 Change-Id: Ic0b62464a326d6a7b6afd823414c6c8fd0d67547
2021-08-03Merge "AOSP Gallery2 API level downgrade" am: fd090edc9c am: f6eaf6c72c am: ↵Treehugger Robot
68c4302a23 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1785531 Change-Id: I8788b57f275a8d81b3a01df375671bf53648ce0c
2021-08-03Merge "AOSP Gallery2 API level downgrade" am: fd090edc9c am: f6eaf6c72cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1785531 Change-Id: If3d36c15e515f85cd778a82be849fe01294b0ef1
2021-08-03Merge "AOSP Gallery2 API level downgrade" am: fd090edc9cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1785531 Change-Id: I2e7904b7a8d4c455e9d1ea2033966ed55ba3bf09
2021-08-03Merge "AOSP Gallery2 API level downgrade"android-s-beta-5android-s-beta-5Treehugger Robot
2021-08-03AOSP Gallery2 API level downgradeDamian Patel
The targetSdkVersion in the AndroidManifest.xml file of the AOSP Gallery2 app has been downgraded to 28. This reason for this is that there have been reports of a storage bug in the newer API level. BUG: 166765965 Change-Id: I2e057b2b4d859858d17f58a7abc0fd17039ed14a
2021-07-23Merge "API level 30 upgrade: AOSP/Gallery2" am: 0c4ace25a3 am: 3f74e1f7a1 ↵Treehugger Robot
am: 651cb829b9 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1776546 Change-Id: I95873cb6cad9132152f9600c58ea33e4c8b85fdc
2021-07-23Merge "API level 30 upgrade: AOSP/Gallery2" am: 0c4ace25a3 am: 3f74e1f7a1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1776546 Change-Id: I3de1655d9183486f914b3461721083b344966f71
2021-07-23Merge "API level 30 upgrade: AOSP/Gallery2" am: 0c4ace25a3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1776546 Change-Id: I6f36d7c1ac41fe9227ddac550a0636ae0c4ccb8b
2021-07-23Merge "API level 30 upgrade: AOSP/Gallery2"Treehugger Robot
2021-07-23API level 30 upgrade: AOSP/Gallery2Damian Patel
The AndroidManifest.xml file of the AOSP Gallery app has been upgraded so that its targetSdkVersion is 30. Test: manual - after the change, the app built, initialized, and ran successfully with all of the UI features functioning properly. CTS provider tests were also run and the output can be seen below: =============== Summary =============== Total Run time: 8m 53s 1/1 modules completed Total Tests : 376 PASSED : 362 FAILED : 0 IGNORED : 6 ASSUMPTION_FAILURE: 8 ============== End of Results ============== Change-Id: I55b30d8192362bbdbab43566d80a4f888fcd0d01
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 19b9d82158 -s ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devXin Li
ours am: 31c16c1ce8 -s ours am skip reason: Change-Id I5c56995272608cecb4a9a948e3c219d091ea7651 with SHA-1 66f15b81b3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfe1e3a78575fb143005c0f57389d48d37ac0955
2021-02-20Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2" am: ↵Bob Badour
2b69347686 am: 012ae6941d am: ccdc9380a5 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1588381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f96f243d4e86f3a09f6825a1d76ecf00c886688
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 19b9d82158 -s oursXin Li
am skip reason: Change-Id I5c56995272608cecb4a9a948e3c219d091ea7651 with SHA-1 66f15b81b3 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a44588cb710e3f93e1fc245b5dd0cc2f284382e
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I5c56995272608cecb4a9a948e3c219d091ea7651 Change-Id: I5ca66d11726272ebea03a8d3719e4468e08ee99f
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2" am: ↵Bob Badour
2b69347686 am: 012ae6941d Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1588381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id242e84ef56a48c20bb400e7244d8287292fb041
2021-02-19Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2" am: 2b69347686Bob Badour
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1588381 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I996c1541173f4511583aa4a1805b96152aca70fd
2021-02-18Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery2Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp gallerycommon/Android.bp jni/Android.bp jni_jpegstream/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I01b3d0c2ee45d0b9cc9cf720f31d6b6bda40b3fd
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: d3b1a755e6 am: ↵Ulyana Trafimovich
db663dcc91 am: 66f15b81b3 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1522978 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ied5920ce16bb8bc02c666d2d2d7712e9231f138a
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: d3b1a755e6 am: db663dcc91Ulyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1522978 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c56995272608cecb4a9a948e3c219d091ea7651
2020-12-14Merge "Revert^2 "Add <uses-library> information."" am: d3b1a755e6Ulyana Trafimovich
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/1522978 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b435e98de0dbbd2e18a5155abddd10e3a049a4b
2020-12-14Merge "Revert^2 "Add <uses-library> information.""android-s-preview-1Ulyana Trafimovich
2020-12-10Revert^2 "Add <uses-library> information."Ulyana Trafimovich
This reverts commit 3112dece74496bd8496292927f9887ecbb213fbc. Reason for revert: fixed "ndk" builds. The optional <uses-library> "com.google.android.media.effects" must be added explicitly to `optional_uses_libs`, because Soong cannot add it automatically to the manifest_fixer (it is not an SDK library dependency and it is optional). Bug: 175286760 Bug: 132357300 Change-Id: Icce3bbf4e2139e15da0afe92a6b3e24f34155214 Test: forrest build for target "ndk" branch "aosp-master".
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 01:22:12 +0000