summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-04-16Merge "Fix uses_libs properties for Gallery2." into mainHEADmastermainTreehugger Robot
2024-04-15Fix uses_libs properties for Gallery2.Jiakai Zhang
Bug: 331528424 Test: m Gallery2 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2fda5c59abc1742f0848311dfdc24a946388251e) Merged-In: Ib6c23c487a57644c0b4873350f84e043d5ad1528 Change-Id: Ib6c23c487a57644c0b4873350f84e043d5ad1528
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284 am: ↵Treehugger Robot
a1d1ba9e47 am: bd5b410295 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: Ice2963de149d9f539d9465b5407f11ccac7bea91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284 am: a1d1ba9e47Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: I0a77248d1cb7c5216eaf4e34b86df5ad20a1f877 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284 am: ↵Treehugger Robot
1d582c52b3 am: acb97bbc24 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: I738cb8ff848d40b2c2d5846aacd3f6d7032335fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284 am: 1d582c52b3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: Ib03eedbdcd72b3674f6c20fbfcfc28348fc63b08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: Iea9a14e2aeb7786d285bfa945722253927b6aed0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into main am: adb236d284Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: Ib388ee42e0ca6725075338aab050d8abe3daff4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Merge "Fix InstantiationException crash" into mainTreehugger Robot
2023-10-18Fix InstantiationException crashVitalii Dmitriev
Add proguard rules to keep ctors for ActivityState subclasses Test: mm packages/apps/Gallery2 Change-Id: Ib3daa5515ab63ee37f855bcaf183e32fdc897412 Signed-off-by: Vitalii Dmitriev <vitalii.dmitriev@unikie.com>
2023-10-07[automerger skipped] Merge "Merge Android 14" into main am: e7b1a8b11c -s ↵Xin Li
ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours am: 22f81fab18 -s ours am: b4bebac170 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: If8fbabb33bcb1b531e8b756f82b72332b430320d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 ↵Xin Li
-s ours am: 39c3832fca -s ours am: c510ca9c40 -s ours am: f821639823 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I46481f9e53fd1f0578a4950476f5171ca27a6227 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: e7b1a8b11c -s ↵Xin Li
ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours am: 22f81fab18 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: Idfdd458124feeb7d4f1229374496b0909414b814 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 ↵Xin Li
-s ours am: 39c3832fca -s ours am: c510ca9c40 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: Ic13e3eddf192277fadd9b15ae6d8857c368ffc95 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: e7b1a8b11c -s ↵Xin Li
ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I6552539260fc4dd9c1bdb6f2091741fb5d147a22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 ↵Xin Li
-s ours am: 39c3832fca -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I9a6d29ceb1f36b80bab4a5c3efda72cf44093938 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: e7b1a8b11c -s ↵Xin Li
ours am: aba11074b5 -s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I7abf2f0cb62266fe2593091352056092c566e6cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 ↵Xin Li
-s ours am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I3c0339d0eed205f86c8b1878cdd05d18bb6391cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge "Merge Android 14" into main am: e7b1a8b11c -s oursXin Li
am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: I69c0050f440ff1e81ff3eba15af7e3c46300a548 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 7c473e90ba -s oursXin Li
am skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013 Change-Id: Ic994b9a039405d9623a7167fd2044ff46b75b373 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge "Merge Android 14" into mainXin Li
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 Change-Id: I49d3c651ba87071fc6baef3d70218d0605ed04de
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am: 0af31d1290 -s ours am: e03cd40b33 -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: Ia8724335fe3d52e58898e1409b1f2314b6c9cccf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours ↵Xin Li
am: 4b7780a971 -s ours am: 3425743765 -s ours am: 58f99c0a0c -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: Ic388d8f97d0565f19e971883e2896953b0923f76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am: 0af31d1290 -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: If3c41f4a1a322677d783800db7c4576307ca5242 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours ↵Xin Li
am: 4b7780a971 -s ours am: 3425743765 -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: I64f382536a2c841a88bdd47cbea52faba38cc8f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: I76e1848692f9b798dbf6ce570762ca342b8bf952 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours ↵Xin Li
am: 4b7780a971 -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: Ie67f4797519f83814a162e2e32057480bcc19d22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge "Merge Android U (ab/10368041)" into ↵Xin Li
aosp-main-future am: 3f6a55895b -s ours am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: I3788984f6e4056ef7060f1bbe2dcc5cbf07b2061 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s oursXin Li
am skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415 Change-Id: I882be19a104703902f93ea30f4fbdbcb79155c0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28Merge "Merge Android U (ab/10368041)" into aosp-main-futuretmp_amf_298295554Xin Li
2023-08-26Merge "Remove RenderScript from Gallery2" into main am: 0f760f7330 am: ↵Treehugger Robot
ebafd55559 am: 45d4101eb6 am: 96bb4eb802 am: 3eb2943a16 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333 Change-Id: I1f28973a71467c1a5391ec0da9a8ce74816780fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Merge "Remove RenderScript from Gallery2" into main am: 0f760f7330 am: ↵Treehugger Robot
ebafd55559 am: 45d4101eb6 am: 96bb4eb802 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333 Change-Id: I999c98f4a16857c7d1a9b5d73aee738d7ed0b809 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Merge "Remove RenderScript from Gallery2" into main am: 0f760f7330 am: ↵Treehugger Robot
ebafd55559 am: 45d4101eb6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333 Change-Id: I2a3ee9159b930d4739eb598c75e9a9aba0b40755 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-26Merge "Remove RenderScript from Gallery2" into main am: 0f760f7330 am: ↵Treehugger Robot
ebafd55559 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333 Change-Id: Ib7273f35741683cd0bd882231381286e338afb38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Merge "Remove RenderScript from Gallery2" into main am: 0f760f7330Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333 Change-Id: I8a221e4a671b8132d680d81da32f2edfdfcdac43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-25Merge "Remove RenderScript from Gallery2" into mainTreehugger Robot
2023-08-18Remove RenderScript from Gallery2Eric Rahm
RenderScript usage is now deprecated. This removes all usage in Gallery2 where currently it is essentially unused. Fixes: 211520324 Test: m Gallery2 Change-Id: I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6
2023-08-14Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I32d1fc79d18c9b23ac221382c81df367c1f3f7cd Change-Id: Ic017bc6178e66d4eaa62f561d117b3b3ce9d0b82
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: ↵Treehugger Robot
d44628ce3a am: c55e65311c am: 23275881d4 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: Ied2321c930f55f0eb5b653b130fb55d2bb95216b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: ↵Treehugger Robot
d44628ce3a am: c55e65311c am: bbd87d9597 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I5e9f464a049094b4dccae6b1937f2baaa3c68dd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseTreehugger Robot
d44628ce3a am: c55e65311c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I1003bf125a8a35ad179b7fcdb33d51227a7cec56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: ↵Treehugger Robot
d44628ce3a am: c55e65311c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: Idd5458e4d9e14b02d648572567d5c8d35910d9ff Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacb am: ↵android14-devTreehugger Robot
d44628ce3a Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I32d1fc79d18c9b23ac221382c81df367c1f3f7cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5 am: e0c9efaacbTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I9192de5821bd4254d37b864be1a40296b30fb4da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer" am: d307c0f8c5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892 Change-Id: I36ce175aef3676caac6237cd3b9d1ea2b607377a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-19Merge "Check for Potential Null Pointer"android-u-beta-1-gplTreehugger Robot
2023-03-15Check for Potential Null PointerJing Mike
After calling the function AndroidBitmap_lockPixels(), neither the return value nor the returned pointers were checked for the possible failure. So the pointers "source" & "destination" could have invalid value. Along with changes above, we also have some compile warnings and code format cleaned. Test: mmm packages/apps/Gallery2, presubmit check. Change-Id: I28a5d678311cb963bacd6f7b96ca2e12d498d965 Signed-off-by: Jing Mike <jingyangliu@eswincomputing.com>
2023-03-13Merge "Remove Nfc beam sharing capability" am: 1ddae3e4a9 am: 6e9686146b am: ↵Henri Chataing
2823c66f49 am: 8e0a97b175 am: f5be8edd6c Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610 Change-Id: I09f023e1b2e5e020454e54513c30f92ca50177af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge "Remove Nfc beam sharing capability" am: 1ddae3e4a9 am: 6e9686146b am: ↵Henri Chataing
2823c66f49 am: 8e0a97b175 am: ad6043f7a8 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610 Change-Id: I21d9dc39c37d455568a751bef54f625a4cc312ea 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-17 22:21:59 +0000