)]}' { "log": [ { "commit": "c0712a1daee50e52cd6f3e8e7698ddb8da3e1bcb", "tree": "e48f84c12c10779f6841e2492c75312960d21095", "parents": [ "22a91b4e74a0f3582222eb996d35053bde4e98a7", "c31ef6e7d9b0bb772a8cf63428ca56d1160d8c9d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 12:34:00 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 12:34:00 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main am: c31ef6e7d9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3438621\n\nChange-Id: I01869158458ffbdb649380f2fbda3c6845b2df35\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c31ef6e7d9b0bb772a8cf63428ca56d1160d8c9d", "tree": "e48f84c12c10779f6841e2492c75312960d21095", "parents": [ "ac931e8ac39835a2256ee47474a8e0b8e92035c0", "75873ad8dbea45740a5413772c5e8157bb30c506" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 12:05:42 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 27 12:05:42 2025 -0800" }, "message": "Merge \"Explicitly keep default constructor in rules without members\" into main" }, { "commit": "22a91b4e74a0f3582222eb996d35053bde4e98a7", "tree": "5f2fc3512dba389642e000fc7bf752e4ac07988a", "parents": [ "3bec8ad0e806da0ddd92ea2cf7b691b7b289216b", "ac931e8ac39835a2256ee47474a8e0b8e92035c0" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Fri Jan 17 22:03:55 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 17 22:03:55 2025 -0800" }, "message": "Merge \"Do not keep runtime invisible annotations in proguard.flags\" into main am: ac931e8ac3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3452836\n\nChange-Id: I57133e76f56d826b915c4262b6d5633fba41b6f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ac931e8ac39835a2256ee47474a8e0b8e92035c0", "tree": "5f2fc3512dba389642e000fc7bf752e4ac07988a", "parents": [ "9c0e06f581dadb3d652dee390c6ea91b53727cf0", "166233a0760830c20a8cba3229f5c75cb95efe1e" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Fri Jan 17 21:35:59 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 17 21:35:59 2025 -0800" }, "message": "Merge \"Do not keep runtime invisible annotations in proguard.flags\" into main" }, { "commit": "166233a0760830c20a8cba3229f5c75cb95efe1e", "tree": "5f2fc3512dba389642e000fc7bf752e4ac07988a", "parents": [ "9c0e06f581dadb3d652dee390c6ea91b53727cf0" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Fri Jan 17 04:26:06 2025 -0800" }, "committer": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Fri Jan 17 04:26:06 2025 -0800" }, "message": "Do not keep runtime invisible annotations in proguard.flags\n\nThis updates the corresponding Android.bp file to keep the runtime invisible annotations, meaning this should be a no-op.\n\nWhen RELEASE_R8_ONLY_RUNTIME_VISIBLE_ANNOTATIONS is enabled, keep_runtime_invisible_annotations will become a no-op, which should lead to all runtime invisible annotations being stripped from this build.\n\nBug: 387958004\nChange-Id: I23b9c55b673346eb36c24cd8ad264fe88703a064\nTest: existing\n" }, { "commit": "75873ad8dbea45740a5413772c5e8157bb30c506", "tree": "2cab085f2457c810b0006e362e91bbef9a79beab", "parents": [ "9c0e06f581dadb3d652dee390c6ea91b53727cf0" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Mon Jan 06 12:57:03 2025 +0100" }, "committer": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Jan 08 00:07:24 2025 -0800" }, "message": "Explicitly keep default constructor in rules without members\n\nR8 implicitly keeps the default constructor when no member rules are specified. Future versions of R8 will require apps to explicitly keep the default constructors that are required for the build to work.\n\nThis conservatively changes all keep rules that currently keep the default constructor to explicitly keep the default constructor.\n\nFuture work will attempt to tighten up the rules that do not require the default constructor to be kept.\n\nBug: 373579455\nTest: existing\nChange-Id: If26bdcc74ce5035d9773a67ad5e4efcbdcf8f93b\n" }, { "commit": "3bec8ad0e806da0ddd92ea2cf7b691b7b289216b", "tree": "e36953d4b35c60d4cfea32bd12246d0befd12efd", "parents": [ "bd66794c7958aa7ec40c4058f0be9ecb39e74736", "9c0e06f581dadb3d652dee390c6ea91b53727cf0" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Dec 07 00:01:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 07 00:01:29 2024 +0000" }, "message": "Merge \"Fix DuplicateBranches errorprone issue\" into main am: a11feecf7e am: 9c0e06f581\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3388621\n\nChange-Id: I582e447f18b9f444093a6b9125bd0b751c3e00ac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c0e06f581dadb3d652dee390c6ea91b53727cf0", "tree": "e36953d4b35c60d4cfea32bd12246d0befd12efd", "parents": [ "1c5088ea74a53bae713a54e40d13c7c5f0e096e1", "a11feecf7ef46f0139ebca3d8e6668da15e18d29" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 23:28:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 06 23:28:46 2024 +0000" }, "message": "Merge \"Fix DuplicateBranches errorprone issue\" into main am: a11feecf7e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3388621\n\nChange-Id: I0a8743cbb5d0aac3fca24ee182842ffbb7df643d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a11feecf7ef46f0139ebca3d8e6668da15e18d29", "tree": "e36953d4b35c60d4cfea32bd12246d0befd12efd", "parents": [ "6bf884ef5187d6ca662c3becb423a89ada38de76", "f5a33fffb7f821c0a17d7ee55215d759d34c22aa" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 23:07:12 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 06 23:07:12 2024 +0000" }, "message": "Merge \"Fix DuplicateBranches errorprone issue\" into main" }, { "commit": "f5a33fffb7f821c0a17d7ee55215d759d34c22aa", "tree": "e36953d4b35c60d4cfea32bd12246d0befd12efd", "parents": [ "6bf884ef5187d6ca662c3becb423a89ada38de76" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Dec 02 17:26:43 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Dec 02 17:26:43 2024 -0800" }, "message": "Fix DuplicateBranches errorprone issue\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nFlag: EXEMPT no-op change\nChange-Id: I575c76d0a1854f158fb62c073c6c7dce3d5f699f\n" }, { "commit": "bd66794c7958aa7ec40c4058f0be9ecb39e74736", "tree": "7156876bfcb91128d18fe7d41ce09596b7f04162", "parents": [ "9b9eace10f6e505528d9c34c4276ed2a673cd4fa", "1c5088ea74a53bae713a54e40d13c7c5f0e096e1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 25 16:21:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 25 16:21:50 2024 +0000" }, "message": "Merge \"Add README with details about the status of support for this app\" into main am: 6bf884ef51 am: 1c5088ea74\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3320633\n\nChange-Id: Iec8dded066a94804adfdcadc8916d3df0cffa695\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1c5088ea74a53bae713a54e40d13c7c5f0e096e1", "tree": "7156876bfcb91128d18fe7d41ce09596b7f04162", "parents": [ "9b9eace10f6e505528d9c34c4276ed2a673cd4fa", "6bf884ef5187d6ca662c3becb423a89ada38de76" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 25 16:07:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 25 16:07:52 2024 +0000" }, "message": "Merge \"Add README with details about the status of support for this app\" into main am: 6bf884ef51\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3320633\n\nChange-Id: I366a58ad1961fa226096834f11c97c64f8aa46f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6bf884ef5187d6ca662c3becb423a89ada38de76", "tree": "7156876bfcb91128d18fe7d41ce09596b7f04162", "parents": [ "89dacb1c2bda3770f92ede0238ae03386b116371", "98cea44d7dde9c109d4de2a8f32432824cfcc71e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Oct 25 15:47:08 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 25 15:47:08 2024 +0000" }, "message": "Merge \"Add README with details about the status of support for this app\" into main" }, { "commit": "98cea44d7dde9c109d4de2a8f32432824cfcc71e", "tree": "7156876bfcb91128d18fe7d41ce09596b7f04162", "parents": [ "89dacb1c2bda3770f92ede0238ae03386b116371" ], "author": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Fri Oct 25 14:41:47 2024 +0000" }, "committer": { "name": "Ian Kasprzak", "email": "iankaz@google.com", "time": "Fri Oct 25 14:41:47 2024 +0000" }, "message": "Add README with details about the status of support for this app\n\nBug: b/375598322\nChange-Id: I555057df8487907774f186f255db62a744de2b78\n" }, { "commit": "9b9eace10f6e505528d9c34c4276ed2a673cd4fa", "tree": "142ed69be393c2b7ad30bdabe8a99b0027698d52", "parents": [ "01f5569145422fb7117ebf24939ddc344e9a34a2", "89dacb1c2bda3770f92ede0238ae03386b116371" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 19:19:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 19:19:42 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: 17c7379bff am: 89dacb1c2b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3248205\n\nChange-Id: Ice0f5fa3b902c1a6aca10dda1113e9c3672fa404\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "89dacb1c2bda3770f92ede0238ae03386b116371", "tree": "142ed69be393c2b7ad30bdabe8a99b0027698d52", "parents": [ "01f5569145422fb7117ebf24939ddc344e9a34a2", "17c7379bffa243e8ae3058e0018e8d3d82d50018" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 18:38:13 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:38:13 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main am: 17c7379bff\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3248205\n\nChange-Id: I885669ceeac59f5b882cd228e05613a613dfb1d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "17c7379bffa243e8ae3058e0018e8d3d82d50018", "tree": "142ed69be393c2b7ad30bdabe8a99b0027698d52", "parents": [ "af7768a491e2b0bda670855ddf309d16b47e7556", "874bb6df845dc84ca9a4e6c7b0ce314cc7dff6a9" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 30 18:08:42 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 30 18:08:42 2024 +0000" }, "message": "Merge \"Make java_sdk_library dependencies explicit\" into main" }, { "commit": "874bb6df845dc84ca9a4e6c7b0ce314cc7dff6a9", "tree": "142ed69be393c2b7ad30bdabe8a99b0027698d52", "parents": [ "af7768a491e2b0bda670855ddf309d16b47e7556" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:29:38 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:29:38 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: Id29920aa0e3064226e4d47590330114f44bb328b\n" }, { "commit": "01f5569145422fb7117ebf24939ddc344e9a34a2", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "847900d23e29cafbb129124e1766d92ffa1340c1", "af7768a491e2b0bda670855ddf309d16b47e7556" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Apr 16 14:19:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 16 14:19:10 2024 +0000" }, "message": "[automerger skipped] Merge \"Fix uses_libs properties for Gallery2.\" into main am: b079a60ec0 -s ours am: af7768a491 -s ours\n\nam skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 29c7778d6a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3041732\n\nChange-Id: I619c7bce9fcd66c9b90780d2ab93b6bea1907de6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "847900d23e29cafbb129124e1766d92ffa1340c1", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "ef8f1a4692582ccc210f576d481734a5b9345739", "f68f490086c8c2bf73602ee803b61b54204cd5b9" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Apr 16 14:19:05 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 16 14:19:05 2024 +0000" }, "message": "[automerger skipped] Fix uses_libs properties for Gallery2. am: 94f6b7c654 -s ours am: f68f490086 -s ours\n\nam skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 29c7778d6a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3041732\n\nChange-Id: If90f16e5bf9d4461d7683a313f6f7cbdb20bdfcd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "af7768a491e2b0bda670855ddf309d16b47e7556", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "f68f490086c8c2bf73602ee803b61b54204cd5b9", "b079a60ec0857ee68dbd0eba39c20998213611fc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Apr 16 13:51:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 16 13:51:24 2024 +0000" }, "message": "[automerger skipped] Merge \"Fix uses_libs properties for Gallery2.\" into main am: b079a60ec0 -s ours\n\nam skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 29c7778d6a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3041732\n\nChange-Id: Iceca6590ab841e8a228328d6cf1cc679e7e4539f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f68f490086c8c2bf73602ee803b61b54204cd5b9", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "29c7778d6aeb8a5bf3a274d8127d63fd433955e4", "94f6b7c65424631ea72c48d761ecbd2f20ddc066" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Apr 16 13:51:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 16 13:51:18 2024 +0000" }, "message": "[automerger skipped] Fix uses_libs properties for Gallery2. am: 94f6b7c654 -s ours\n\nam skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 29c7778d6a is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3041732\n\nChange-Id: I639a262207d477993fa36551370ae7399c4598ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b079a60ec0857ee68dbd0eba39c20998213611fc", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "06d502951fccd0172e1db8729dd04c7473e5c474", "94f6b7c65424631ea72c48d761ecbd2f20ddc066" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Apr 16 13:35:55 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Apr 16 13:35:55 2024 +0000" }, "message": "Merge \"Fix uses_libs properties for Gallery2.\" into main" }, { "commit": "ef8f1a4692582ccc210f576d481734a5b9345739", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "2fda5c59abc1742f0848311dfdc24a946388251e", "29c7778d6aeb8a5bf3a274d8127d63fd433955e4" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Apr 15 22:50:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 22:50:58 2024 +0000" }, "message": "[automerger skipped] Fix uses_libs properties for Gallery2. am: 29c7778d6a -s ours\n\nam skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 2fda5c59ab is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/26969499\n\nChange-Id: I259b17824192c228a2ef6d85df97a91d1e2c30f6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "29c7778d6aeb8a5bf3a274d8127d63fd433955e4", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "06d502951fccd0172e1db8729dd04c7473e5c474" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Mar 29 00:11:09 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 16:21:45 2024 +0000" }, "message": "Fix uses_libs properties for Gallery2.\n\nBug: 331528424\nTest: m Gallery2\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2fda5c59abc1742f0848311dfdc24a946388251e)\nMerged-In: Ib6c23c487a57644c0b4873350f84e043d5ad1528\nChange-Id: Ib6c23c487a57644c0b4873350f84e043d5ad1528\n" }, { "commit": "94f6b7c65424631ea72c48d761ecbd2f20ddc066", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "06d502951fccd0172e1db8729dd04c7473e5c474" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Apr 15 11:16:20 2024 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 11:16:20 2024 +0000" }, "message": "Fix uses_libs properties for Gallery2.\n\nBug: 331528424\nTest: m Gallery2\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2fda5c59abc1742f0848311dfdc24a946388251e)\nMerged-In: Ib6c23c487a57644c0b4873350f84e043d5ad1528\nChange-Id: Ib6c23c487a57644c0b4873350f84e043d5ad1528\n" }, { "commit": "2fda5c59abc1742f0848311dfdc24a946388251e", "tree": "597b601b4f2947ba572167371af48a967bcf68bd", "parents": [ "06d502951fccd0172e1db8729dd04c7473e5c474" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Mar 29 00:11:09 2024 +0000" }, "committer": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Fri Mar 29 00:11:09 2024 +0000" }, "message": "Fix uses_libs properties for Gallery2.\n\nBug: 331528424\nTest: m Gallery2\nChange-Id: Ib6c23c487a57644c0b4873350f84e043d5ad1528\n" }, { "commit": "06d502951fccd0172e1db8729dd04c7473e5c474", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "174c0862b19a68771607857914cccd12e7713e85", "bd5b4102959d24d3d98ce2ae01426eecbba57328" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 19:48:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 19:48:03 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284 am: a1d1ba9e47 am: bd5b410295\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: Ice2963de149d9f539d9465b5407f11ccac7bea91\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd5b4102959d24d3d98ce2ae01426eecbba57328", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "acb97bbc24a2b51d1903fe3e29e4903039250b4f", "a1d1ba9e47820f4b289caa77533d9a45280eb3ea" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:59 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284 am: a1d1ba9e47\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: I0a77248d1cb7c5216eaf4e34b86df5ad20a1f877\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "174c0862b19a68771607857914cccd12e7713e85", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "b2c586806cbcd701d3846c5316ebb32e0172699f", "acb97bbc24a2b51d1903fe3e29e4903039250b4f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 09:52:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 09:52:28 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284 am: 1d582c52b3 am: acb97bbc24\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: I738cb8ff848d40b2c2d5846aacd3f6d7032335fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "acb97bbc24a2b51d1903fe3e29e4903039250b4f", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "b4bebac170cc233b311ba7e5ea2d725847a4722e", "1d582c52b3d7f329eb49847cc2170ddc8dc4d126" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 09:19:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 09:19:50 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284 am: 1d582c52b3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: Ib03eedbdcd72b3674f6c20fbfcfc28348fc63b08\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a1d1ba9e47820f4b289caa77533d9a45280eb3ea", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "b8bdd018e9e59c690e8437eaa7701c84ff83285c", "adb236d284aed69d71d15e5498d3e950d1f2b483" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 08:46:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 08:46:18 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: Iea9a14e2aeb7786d285bfa945722253927b6aed0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d582c52b3d7f329eb49847cc2170ddc8dc4d126", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "b4bebac170cc233b311ba7e5ea2d725847a4722e", "adb236d284aed69d71d15e5498d3e950d1f2b483" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 08:46:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 08:46:15 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main am: adb236d284\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112\n\nChange-Id: Ib388ee42e0ca6725075338aab050d8abe3daff4b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "adb236d284aed69d71d15e5498d3e950d1f2b483", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "e7b1a8b11ccb26471795fb3b757625a9b2d977fc", "8a429da77d183831ee425ddd33ccf94fe83731e4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 19 08:24:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 19 08:24:51 2023 +0000" }, "message": "Merge \"Fix InstantiationException crash\" into main" }, { "commit": "8a429da77d183831ee425ddd33ccf94fe83731e4", "tree": "091839e7b16f8020e2c024c0abe15d2c92315d30", "parents": [ "e7b1a8b11ccb26471795fb3b757625a9b2d977fc" ], "author": { "name": "Vitalii Dmitriev", "email": "vitalii.dmitriev@unikie.com", "time": "Wed Oct 18 08:50:54 2023 +0000" }, "committer": { "name": "Vitalii Dmitriev", "email": "vitalii.dmitriev@unikie.com", "time": "Wed Oct 18 09:05:12 2023 +0000" }, "message": "Fix InstantiationException crash\n\nAdd proguard rules to keep ctors for ActivityState subclasses\n\nTest: mm packages/apps/Gallery2\n\nChange-Id: Ib3daa5515ab63ee37f855bcaf183e32fdc897412\nSigned-off-by: Vitalii Dmitriev \u003cvitalii.dmitriev@unikie.com\u003e\n" }, { "commit": "b2c586806cbcd701d3846c5316ebb32e0172699f", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "e565af18f997ff3dc5cb003440bb4aed47765cc6", "b4bebac170cc233b311ba7e5ea2d725847a4722e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:25:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:25:25 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: e7b1a8b11c -s ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours am: 22f81fab18 -s ours am: b4bebac170 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: If8fbabb33bcb1b531e8b756f82b72332b430320d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e565af18f997ff3dc5cb003440bb4aed47765cc6", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "200b6ad747232449b1f492abbff867eac895d5ad", "f8216398235d768b51d6d9d384869d2fb87c6cbf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:10 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours am: 39c3832fca -s ours am: c510ca9c40 -s ours am: f821639823 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I46481f9e53fd1f0578a4950476f5171ca27a6227\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4bebac170cc233b311ba7e5ea2d725847a4722e", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "f8216398235d768b51d6d9d384869d2fb87c6cbf", "22f81fab189adb5afc545434f43b422cd6ad347a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:06:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:06:07 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: e7b1a8b11c -s ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours am: 22f81fab18 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: Idfdd458124feeb7d4f1229374496b0909414b814\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8216398235d768b51d6d9d384869d2fb87c6cbf", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "e03cd40b33c53e6e65d3940f4fcf9eed66ba8e9e", "c510ca9c404fc590f85f8f094a4b8e04e03949c0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:39 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours am: 39c3832fca -s ours am: c510ca9c40 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: Ic13e3eddf192277fadd9b15ae6d8857c368ffc95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "22f81fab189adb5afc545434f43b422cd6ad347a", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "c510ca9c404fc590f85f8f094a4b8e04e03949c0", "b8bdd018e9e59c690e8437eaa7701c84ff83285c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:56:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:56:06 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: e7b1a8b11c -s ours am: aba11074b5 -s ours am: b8bdd018e9 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I6552539260fc4dd9c1bdb6f2091741fb5d147a22\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c510ca9c404fc590f85f8f094a4b8e04e03949c0", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "0af31d129078025b8e5d47f76ee44bfc983a687b", "39c3832fca285891ca4a9da71aa870716798d823" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:50:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:50:49 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours am: 39c3832fca -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I9a6d29ceb1f36b80bab4a5c3efda72cf44093938\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b8bdd018e9e59c690e8437eaa7701c84ff83285c", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "39c3832fca285891ca4a9da71aa870716798d823", "aba11074b5292f50c8f0889b8ba5d201d97265ca" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:04:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:04:31 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: e7b1a8b11c -s ours am: aba11074b5 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I7abf2f0cb62266fe2593091352056092c566e6cd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "39c3832fca285891ca4a9da71aa870716798d823", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "e9a76ddbd81ba14f148457fb11256f35181b9674", "fa92674748b169ec7669b20adea1fbc2f11133e2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:14 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours am: fa92674748 -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I3c0339d0eed205f86c8b1878cdd05d18bb6391cc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aba11074b5292f50c8f0889b8ba5d201d97265ca", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "fa92674748b169ec7669b20adea1fbc2f11133e2", "e7b1a8b11ccb26471795fb3b757625a9b2d977fc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:57:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:57:26 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: e7b1a8b11c -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: I69c0050f440ff1e81ff3eba15af7e3c46300a548\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fa92674748b169ec7669b20adea1fbc2f11133e2", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "3f6a55895b0eadd858d992de52f79767e3d72e29", "7c473e90ba4ba9a821c21ef0af266065acab6277" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:08 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 7c473e90ba -s ours\n\nam skip reason: Merged-In I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6 with SHA-1 35095803c7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2777013\n\nChange-Id: Ic994b9a039405d9623a7167fd2044ff46b75b373\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e7b1a8b11ccb26471795fb3b757625a9b2d977fc", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "0f760f7330d2897210beba8ddcb9bccba73b76d8", "7c473e90ba4ba9a821c21ef0af266065acab6277" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 05:38:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 06 05:38:51 2023 +0000" }, "message": "Merge \"Merge Android 14\" into main" }, { "commit": "7c473e90ba4ba9a821c21ef0af266065acab6277", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "0f760f7330d2897210beba8ddcb9bccba73b76d8", "3f6a55895b0eadd858d992de52f79767e3d72e29" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:41:38 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:41:38 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6\nChange-Id: I49d3c651ba87071fc6baef3d70218d0605ed04de\n" }, { "commit": "200b6ad747232449b1f492abbff867eac895d5ad", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "e42b0ab32b73b3e7136d875cbd0b391f1e648603", "e03cd40b33c53e6e65d3940f4fcf9eed66ba8e9e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:43:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:43:08 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android U (ab/10368041)\" into aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am: 0af31d1290 -s ours am: e03cd40b33 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: Ia8724335fe3d52e58898e1409b1f2314b6c9cccf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e42b0ab32b73b3e7136d875cbd0b391f1e648603", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "9c112f620e7032bf7f856bd84fee3465fbf924b1", "58f99c0a0c74900e3fb0756a0e2f31fe96f0cd14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:04 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours am: 4b7780a971 -s ours am: 3425743765 -s ours am: 58f99c0a0c -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: Ic388d8f97d0565f19e971883e2896953b0923f76\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e03cd40b33c53e6e65d3940f4fcf9eed66ba8e9e", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "58f99c0a0c74900e3fb0756a0e2f31fe96f0cd14", "0af31d129078025b8e5d47f76ee44bfc983a687b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:16:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:16:02 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android U (ab/10368041)\" into aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours am: 0af31d1290 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: If3c41f4a1a322677d783800db7c4576307ca5242\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "58f99c0a0c74900e3fb0756a0e2f31fe96f0cd14", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "3eb2943a16959bc182e2bf245cfc8e4b4ccfd2cb", "3425743765510c38669d2eecf2d44b7d42bb6b2d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:10:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:10:58 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours am: 4b7780a971 -s ours am: 3425743765 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: I64f382536a2c841a88bdd47cbea52faba38cc8f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0af31d129078025b8e5d47f76ee44bfc983a687b", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "3425743765510c38669d2eecf2d44b7d42bb6b2d", "e9a76ddbd81ba14f148457fb11256f35181b9674" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:40:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:40:22 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android U (ab/10368041)\" into aosp-main-future am: 3f6a55895b -s ours am: e9a76ddbd8 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: I76e1848692f9b798dbf6ce570762ca342b8bf952\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3425743765510c38669d2eecf2d44b7d42bb6b2d", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "96bb4eb8027100a9e42e58a957a9a7256b36623a", "4b7780a971f208d90487d8bdee241cc93fbacdf1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:15 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours am: 4b7780a971 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: Ie67f4797519f83814a162e2e32057480bcc19d22\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e9a76ddbd81ba14f148457fb11256f35181b9674", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "4b7780a971f208d90487d8bdee241cc93fbacdf1", "3f6a55895b0eadd858d992de52f79767e3d72e29" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:04:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:04:24 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android U (ab/10368041)\" into aosp-main-future am: 3f6a55895b -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: I3788984f6e4056ef7060f1bbe2dcc5cbf07b2061\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b7780a971f208d90487d8bdee241cc93fbacdf1", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "45d4101eb658e5476291946752ca54de0e7d1dea", "47b43186679e1c6d34943bf8079d1f28caa9e4f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:15 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 47b4318667 -s ours\n\nam skip reason: Merged-In I32d1fc79d18c9b23ac221382c81df367c1f3f7cd with SHA-1 c55e65311c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/24181415\n\nChange-Id: I882be19a104703902f93ea30f4fbdbcb79155c0b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f6a55895b0eadd858d992de52f79767e3d72e29", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "ebafd555591e9992115dc2b4ad3dc89d0bac9579", "47b43186679e1c6d34943bf8079d1f28caa9e4f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 22:12:23 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 28 22:12:23 2023 +0000" }, "message": "Merge \"Merge Android U (ab/10368041)\" into aosp-main-future" }, { "commit": "9c112f620e7032bf7f856bd84fee3465fbf924b1", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "67c4b172fa8a92451e1b03cf8fcf6028d2bf0d92", "3eb2943a16959bc182e2bf245cfc8e4b4ccfd2cb" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Aug 26 03:36:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 26 03:36:33 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main am: 0f760f7330 am: ebafd55559 am: 45d4101eb6 am: 96bb4eb802 am: 3eb2943a16\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333\n\nChange-Id: I1f28973a71467c1a5391ec0da9a8ce74816780fe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3eb2943a16959bc182e2bf245cfc8e4b4ccfd2cb", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "bbd87d959729768899c90458ff9669aef57b3846", "96bb4eb8027100a9e42e58a957a9a7256b36623a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Aug 26 02:41:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 26 02:41:13 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main am: 0f760f7330 am: ebafd55559 am: 45d4101eb6 am: 96bb4eb802\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333\n\nChange-Id: I999c98f4a16857c7d1a9b5d73aee738d7ed0b809\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "96bb4eb8027100a9e42e58a957a9a7256b36623a", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "bbd87d959729768899c90458ff9669aef57b3846", "45d4101eb658e5476291946752ca54de0e7d1dea" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Aug 26 01:24:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 26 01:24:57 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main am: 0f760f7330 am: ebafd55559 am: 45d4101eb6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333\n\nChange-Id: I2a3ee9159b930d4739eb598c75e9a9aba0b40755\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "45d4101eb658e5476291946752ca54de0e7d1dea", "tree": "1fb50112beadcba35b1f1d8ec658810fabee54f0", "parents": [ "c55e65311c7b96d2a01d9624e318685c0cc12654", "ebafd555591e9992115dc2b4ad3dc89d0bac9579" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Aug 26 00:01:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Aug 26 00:01:07 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main am: 0f760f7330 am: ebafd55559\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333\n\nChange-Id: Ib7273f35741683cd0bd882231381286e338afb38\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ebafd555591e9992115dc2b4ad3dc89d0bac9579", "tree": "d133b014655146a7423b15081dc0bf4428f7936f", "parents": [ "d44628ce3adee66a8102a3db6aef4de26e173b4e", "0f760f7330d2897210beba8ddcb9bccba73b76d8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 25 22:34:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 25 22:34:44 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main am: 0f760f7330\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2717333\n\nChange-Id: I8a221e4a671b8132d680d81da32f2edfdfcdac43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0f760f7330d2897210beba8ddcb9bccba73b76d8", "tree": "d133b014655146a7423b15081dc0bf4428f7936f", "parents": [ "d44628ce3adee66a8102a3db6aef4de26e173b4e", "35095803c79ed6a99e960d87c6509385ede2fb5f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Aug 25 21:24:17 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 25 21:24:17 2023 +0000" }, "message": "Merge \"Remove RenderScript from Gallery2\" into main" }, { "commit": "35095803c79ed6a99e960d87c6509385ede2fb5f", "tree": "d133b014655146a7423b15081dc0bf4428f7936f", "parents": [ "d44628ce3adee66a8102a3db6aef4de26e173b4e" ], "author": { "name": "Eric Rahm", "email": "erahm@google.com", "time": "Thu Aug 17 06:37:56 2023 -0700" }, "committer": { "name": "Eric Rahm", "email": "erahm@google.com", "time": "Fri Aug 18 06:51:02 2023 -0700" }, "message": "Remove RenderScript from Gallery2\n\nRenderScript usage is now deprecated. This removes all usage in Gallery2\nwhere currently it is essentially unused.\n\nFixes: 211520324\nTest: m Gallery2\nChange-Id: I6d9584ab5eeda0e22b0b7c9b816c91266a4003f6\n" }, { "commit": "47b43186679e1c6d34943bf8079d1f28caa9e4f8", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "d44628ce3adee66a8102a3db6aef4de26e173b4e", "c55e65311c7b96d2a01d9624e318685c0cc12654" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:41:56 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:41:56 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I32d1fc79d18c9b23ac221382c81df367c1f3f7cd\nChange-Id: Ic017bc6178e66d4eaa62f561d117b3b3ce9d0b82\n" }, { "commit": "67c4b172fa8a92451e1b03cf8fcf6028d2bf0d92", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "9e448d02852175417b2d2dcbc3bd4d8f01002dcc", "23275881d49f316717b283105f826393ef27fe6b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 07:57:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 07:57:13 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a am: c55e65311c am: 23275881d4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: Ied2321c930f55f0eb5b653b130fb55d2bb95216b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e448d02852175417b2d2dcbc3bd4d8f01002dcc", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "270ca8afdd33d3dc71101169a9b68fee2a15cf50", "bbd87d959729768899c90458ff9669aef57b3846" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 07:55:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 07:55:36 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a am: c55e65311c am: bbd87d9597\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: I5e9f464a049094b4dccae6b1937f2baaa3c68dd0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bbd87d959729768899c90458ff9669aef57b3846", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "f5be8edd6c9ab935b32c4635a8d896e42a1528aa", "c55e65311c7b96d2a01d9624e318685c0cc12654" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 07:22:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 07:22:55 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a am: c55e65311c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: I1003bf125a8a35ad179b7fcdb33d51227a7cec56\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "23275881d49f316717b283105f826393ef27fe6b", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "ad6043f7a8ec9d3e0b08a50b38e6f9c236952f3b", "c55e65311c7b96d2a01d9624e318685c0cc12654" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 07:22:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 07:22:52 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a am: c55e65311c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: Idd5458e4d9e14b02d648572567d5c8d35910d9ff\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c55e65311c7b96d2a01d9624e318685c0cc12654", "tree": "7e917e6915033c650e5215dfaeedde023878e9c2", "parents": [ "8e0a97b1757a2a27d61d354f4a5d3ea8507ba788", "d44628ce3adee66a8102a3db6aef4de26e173b4e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 06:43:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 06:43:50 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb am: d44628ce3a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: I32d1fc79d18c9b23ac221382c81df367c1f3f7cd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d44628ce3adee66a8102a3db6aef4de26e173b4e", "tree": "219db05fc0a3960e7f43b6cd69f1a90793a88dbd", "parents": [ "2823c66f49e562f7906e3ec4232c1f39a72fae8b", "e0c9efaacb5de3eece60e05c48149d6b1012a5a8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 06:24:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 06:24:37 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5 am: e0c9efaacb\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: I9192de5821bd4254d37b864be1a40296b30fb4da\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e0c9efaacb5de3eece60e05c48149d6b1012a5a8", "tree": "219db05fc0a3960e7f43b6cd69f1a90793a88dbd", "parents": [ "6e9686146b2491edc6815ead76ab1d467283f224", "d307c0f8c5327b01933d653ace9ea5d6234fa487" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 05:40:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Mar 19 05:40:59 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\" am: d307c0f8c5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2431892\n\nChange-Id: I36ce175aef3676caac6237cd3b9d1ea2b607377a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d307c0f8c5327b01933d653ace9ea5d6234fa487", "tree": "219db05fc0a3960e7f43b6cd69f1a90793a88dbd", "parents": [ "6e9686146b2491edc6815ead76ab1d467283f224", "b97cdadcbf7db978c54481f39d021308105ae8d4" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun Mar 19 05:08:51 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sun Mar 19 05:08:51 2023 +0000" }, "message": "Merge \"Check for Potential Null Pointer\"" }, { "commit": "b97cdadcbf7db978c54481f39d021308105ae8d4", "tree": "219db05fc0a3960e7f43b6cd69f1a90793a88dbd", "parents": [ "6e9686146b2491edc6815ead76ab1d467283f224" ], "author": { "name": "Jing Mike", "email": "jingyangliu@eswincomputing.com", "time": "Fri Feb 10 18:42:37 2023 +0800" }, "committer": { "name": "Jing Mike", "email": "jingyangliu@eswincomputing.com", "time": "Wed Mar 15 18:42:56 2023 +0800" }, "message": "Check for Potential Null Pointer\n\nAfter calling the function AndroidBitmap_lockPixels(), neither the\nreturn value nor the returned pointers were checked for the possible\nfailure. So the pointers \"source\" \u0026 \"destination\" could have invalid\nvalue.\n\nAlong with changes above, we also have some compile warnings and code\nformat cleaned.\n\nTest: mmm packages/apps/Gallery2, presubmit check.\n\nChange-Id: I28a5d678311cb963bacd6f7b96ca2e12d498d965\nSigned-off-by: Jing Mike \u003cjingyangliu@eswincomputing.com\u003e\n" }, { "commit": "270ca8afdd33d3dc71101169a9b68fee2a15cf50", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "dff137d8c47e403110f3b5763ec3486b4402717d", "f5be8edd6c9ab935b32c4635a8d896e42a1528aa" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 21:27:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 21:27:25 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 am: 8e0a97b175 am: f5be8edd6c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: I09f023e1b2e5e020454e54513c30f92ca50177af\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dff137d8c47e403110f3b5763ec3486b4402717d", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "d507c9be3490fe1c06212fb76f10829ba9d727db", "ad6043f7a8ec9d3e0b08a50b38e6f9c236952f3b" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 21:25:59 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 21:25:59 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 am: 8e0a97b175 am: ad6043f7a8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: I21d9dc39c37d455568a751bef54f625a4cc312ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f5be8edd6c9ab935b32c4635a8d896e42a1528aa", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "d507c9be3490fe1c06212fb76f10829ba9d727db", "8e0a97b1757a2a27d61d354f4a5d3ea8507ba788" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 20:40:47 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 20:40:47 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 am: 8e0a97b175\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: I1989670417e708577ec886754e5f1ceefb873a75\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad6043f7a8ec9d3e0b08a50b38e6f9c236952f3b", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "d507c9be3490fe1c06212fb76f10829ba9d727db", "8e0a97b1757a2a27d61d354f4a5d3ea8507ba788" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 20:39:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 20:39:35 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49 am: 8e0a97b175\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: I0f758023c8fbc417892e7348bc565c519ccbda8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8e0a97b1757a2a27d61d354f4a5d3ea8507ba788", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "d507c9be3490fe1c06212fb76f10829ba9d727db", "2823c66f49e562f7906e3ec4232c1f39a72fae8b" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 20:07:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 20:07:20 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b am: 2823c66f49\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: I378f6a2279a48ef44e86a50029c9d7884fcc1db9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2823c66f49e562f7906e3ec4232c1f39a72fae8b", "tree": "2b225484366aa82c99f94befbafff6cfa92143b0", "parents": [ "01703a723d7311f70a932d777d790acb8d64cb3a", "6e9686146b2491edc6815ead76ab1d467283f224" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 19:07:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 19:07:40 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9 am: 6e9686146b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: Iab392761eef95bfca09193989d11b846b5042149\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e9686146b2491edc6815ead76ab1d467283f224", "tree": "2b225484366aa82c99f94befbafff6cfa92143b0", "parents": [ "c5904320e62cd6ab6f47b7eef4e2df420415cc6f", "1ddae3e4a96e050e80ebc49b5c09371029e8034f" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 18:32:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 13 18:32:27 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\" am: 1ddae3e4a9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2475610\n\nChange-Id: Ifbd8331cd4b7fc1c1dc9859ef07254d74be782eb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1ddae3e4a96e050e80ebc49b5c09371029e8034f", "tree": "2b225484366aa82c99f94befbafff6cfa92143b0", "parents": [ "a6df261ea4c04117de4e0b5a5af51295884c9886", "b28f1e89929c7053d8e0aeae1c67224e398cf25e" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Mar 13 17:32:30 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 13 17:32:30 2023 +0000" }, "message": "Merge \"Remove Nfc beam sharing capability\"" }, { "commit": "b28f1e89929c7053d8e0aeae1c67224e398cf25e", "tree": "2b225484366aa82c99f94befbafff6cfa92143b0", "parents": [ "a6df261ea4c04117de4e0b5a5af51295884c9886" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Dec 19 19:23:25 2022 +0000" }, "committer": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Tue Mar 07 23:43:22 2023 +0000" }, "message": "Remove Nfc beam sharing capability\n\nThe Nfc Beam feature is now removed.\n\nTest: m Gallery2\nBug: 236980291\nChange-Id: I0de0904e74a73471a785b87cafebccbe25e7450f\n(cherry picked from commit 617969afea0cca94aa2e76e23edc068453383389)\n" }, { "commit": "d507c9be3490fe1c06212fb76f10829ba9d727db", "tree": "1d69d75639ad49bb90da64f9ebd3f4864c954999", "parents": [ "30b2b7b249418e499bd538a1005172294b61b024" ], "author": { "name": "spickl", "email": "spickl@google.com", "time": "Thu Jan 26 19:25:59 2023 +0000" }, "committer": { "name": "spickl", "email": "spickl@google.com", "time": "Mon Jan 30 14:16:54 2023 +0000" }, "message": "Fix Gallery2 path traversal bug\n\nFix a path traversal bug that allowed a malicious launcher app to access files in the private space of the Gallery2 app by injecting a bad path.\nFix: Check URI before passing the file out from SharedImageProvider and raise exception if it\u0027s not pointing to the relevant folder.\nBug: 198174170\nTest: manual by following the reporters instructions\n\nChange-Id: I74dce6c4794b3eafb922bb9a2f2516677cc5f4d8\n" }, { "commit": "30b2b7b249418e499bd538a1005172294b61b024", "tree": "7a407309bb3e3471d24f967b7e59609c9c18ed6c", "parents": [ "617969afea0cca94aa2e76e23edc068453383389", "01703a723d7311f70a932d777d790acb8d64cb3a" ], "author": { "name": "Sebastian Pickl", "email": "spickl@google.com", "time": "Mon Jan 16 11:01:54 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 16 11:01:54 2023 +0000" }, "message": "Merge \"Fix AOSP gallery mute crash\" am: a6df261ea4 am: c5904320e6 am: 01703a723d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2386113\n\nChange-Id: I355236947a4a8ea8d76e4fec019da29087bf5f01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01703a723d7311f70a932d777d790acb8d64cb3a", "tree": "1634c97c8bf847c8db9d72f03b28c38ae12b5fcd", "parents": [ "b773a348ffcf83e60b38e518644104b04d37e03d", "c5904320e62cd6ab6f47b7eef4e2df420415cc6f" ], "author": { "name": "Sebastian Pickl", "email": "spickl@google.com", "time": "Mon Jan 16 10:22:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 16 10:22:37 2023 +0000" }, "message": "Merge \"Fix AOSP gallery mute crash\" am: a6df261ea4 am: c5904320e6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2386113\n\nChange-Id: I82bd363c8ad04a9eeda56b1f24f26323257eb13f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c5904320e62cd6ab6f47b7eef4e2df420415cc6f", "tree": "1634c97c8bf847c8db9d72f03b28c38ae12b5fcd", "parents": [ "b773a348ffcf83e60b38e518644104b04d37e03d", "a6df261ea4c04117de4e0b5a5af51295884c9886" ], "author": { "name": "Sebastian Pickl", "email": "spickl@google.com", "time": "Mon Jan 16 09:50:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 16 09:50:02 2023 +0000" }, "message": "Merge \"Fix AOSP gallery mute crash\" am: a6df261ea4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2386113\n\nChange-Id: I83970252f59d3eb1a96bfa025a6f290de89cfdf3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6df261ea4c04117de4e0b5a5af51295884c9886", "tree": "1634c97c8bf847c8db9d72f03b28c38ae12b5fcd", "parents": [ "6606e524664077c564604a973b129624ab1fdfec", "4ce2db2b9ce45241789f2528865cb70f6c52c3f7" ], "author": { "name": "Sebastian Pickl", "email": "spickl@google.com", "time": "Mon Jan 16 09:15:02 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 16 09:15:02 2023 +0000" }, "message": "Merge \"Fix AOSP gallery mute crash\"" }, { "commit": "4ce2db2b9ce45241789f2528865cb70f6c52c3f7", "tree": "1634c97c8bf847c8db9d72f03b28c38ae12b5fcd", "parents": [ "6606e524664077c564604a973b129624ab1fdfec" ], "author": { "name": "spickl", "email": "spickl@google.com", "time": "Thu Jan 12 17:56:59 2023 +0000" }, "committer": { "name": "spickl", "email": "spickl@google.com", "time": "Fri Jan 13 10:12:29 2023 +0000" }, "message": "Fix AOSP gallery mute crash\n\nfix b/218791647 [AOSP] Gallery app crash when press on Mute button and saving trimmed video\nreason for crash was an api change in sdk 24 https://developer.android.com/google/play/requirements/target-sdk#expandable-1\nfixed thi issue following https://developer.android.com/training/secure-file-sharing/setup-sharing\n+ Specify file provider in manifest\n+ Specify shareable directories\n+ Generate uri with FileProvider\n\nTest: reproduced the steps from the bug report manually and observed logs - crash was resolved\n\nChange-Id: I34190720790e0b69d6695474461e461b9c6f61e5\n" }, { "commit": "617969afea0cca94aa2e76e23edc068453383389", "tree": "b2aa83581b852098f70346aa4befd6f1781c68da", "parents": [ "d901f507e21135c2293b957140c247230e3f244b" ], "author": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Dec 19 19:23:25 2022 +0000" }, "committer": { "name": "Henri Chataing", "email": "henrichataing@google.com", "time": "Mon Dec 19 19:23:25 2022 +0000" }, "message": "Remove Nfc beam sharing capability\n\nThe Nfc Beam feature is now removed.\n\nTest: m Gallery2\nBug: 236980291\nChange-Id: I0de0904e74a73471a785b87cafebccbe25e7450f\n" }, { "commit": "d901f507e21135c2293b957140c247230e3f244b", "tree": "e139f226bc9927bd1976ce7c6d57521903b70b3b", "parents": [ "a3d7356a860a508c8e0472f3301044000840c67f", "b773a348ffcf83e60b38e518644104b04d37e03d" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 09 23:02:06 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 23:02:06 2022 +0000" }, "message": "Merge \"Fix sizeof warnings on malloc\" am: 6606e52466 am: 5e67bea581 am: b773a348ff\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2337322\n\nChange-Id: I44b69a3f22ef3f68c3cdd70b3d3371667cfaeadb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b773a348ffcf83e60b38e518644104b04d37e03d", "tree": "ee4afcb719b92a5dc813fdbbc2d3f824e022ee77", "parents": [ "6f9037a779352dbc31c1749f14efd2f7eabe9b91", "5e67bea5816d659d127a2c5dbc3653d0f8fdd90b" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 09 21:49:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 21:49:31 2022 +0000" }, "message": "Merge \"Fix sizeof warnings on malloc\" am: 6606e52466 am: 5e67bea581\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2337322\n\nChange-Id: I974aba46fb902775ec18e2c5566d3d63f5b4f984\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5e67bea5816d659d127a2c5dbc3653d0f8fdd90b", "tree": "ee4afcb719b92a5dc813fdbbc2d3f824e022ee77", "parents": [ "da3f900711c7acc205931c25c72d50b8c1d34e1b", "6606e524664077c564604a973b129624ab1fdfec" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 09 20:46:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 20:46:02 2022 +0000" }, "message": "Merge \"Fix sizeof warnings on malloc\" am: 6606e52466\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2337322\n\nChange-Id: Ie889b35ef7d3e4228740797e4b2f513a13291826\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6606e524664077c564604a973b129624ab1fdfec", "tree": "ee4afcb719b92a5dc813fdbbc2d3f824e022ee77", "parents": [ "da3f900711c7acc205931c25c72d50b8c1d34e1b", "d743eb2003625f02eabdbb205d75c7b7868d3e28" ], "author": { "name": "Chih-hung Hsieh", "email": "chh@google.com", "time": "Fri Dec 09 20:30:05 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 09 20:30:05 2022 +0000" }, "message": "Merge \"Fix sizeof warnings on malloc\"" }, { "commit": "d743eb2003625f02eabdbb205d75c7b7868d3e28", "tree": "ee4afcb719b92a5dc813fdbbc2d3f824e022ee77", "parents": [ "9e0161ca539c569c8624948f280fb41a56098d2e" ], "author": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Dec 08 20:10:50 2022 -0800" }, "committer": { "name": "Chih-Hung Hsieh", "email": "chh@google.com", "time": "Thu Dec 08 20:10:50 2022 -0800" }, "message": "Fix sizeof warnings on malloc\n\nAlthough sizeof(short) and sizeof(unsigned short)\nshould have the same value; use the correct type\nto suppress the warning.\n\nBug: 261919363\nTest: make tidy-packages-apps-Gallery2-jni_subset\nChange-Id: I8244fe20e613d0dea2a74753deec64346d5e9f5b\n" }, { "commit": "a3d7356a860a508c8e0472f3301044000840c67f", "tree": "b01a95fb49623282d90b1e5bc6499d4e8c926d09", "parents": [ "b142c5e201232e97aac9fc13dce027629a638b3d", "6f9037a779352dbc31c1749f14efd2f7eabe9b91" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Nov 11 21:36:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 11 21:36:46 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: 9e0161ca53 am: da3f900711 am: 6f9037a779\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2256436\n\nChange-Id: I924d3637d37bc82b0f2f242012643f8904d5ea05\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f9037a779352dbc31c1749f14efd2f7eabe9b91", "tree": "fcc86e881b7055aba91680ce51908d88071b94ca", "parents": [ "7029c8801fd3284d7e5fce9302eb13b61c6b4750", "da3f900711c7acc205931c25c72d50b8c1d34e1b" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Nov 11 21:05:28 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 11 21:05:28 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: 9e0161ca53 am: da3f900711\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2256436\n\nChange-Id: Ifd7b0b1affd9f4b52e8c6ae1e5549926a03c15c5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da3f900711c7acc205931c25c72d50b8c1d34e1b", "tree": "fcc86e881b7055aba91680ce51908d88071b94ca", "parents": [ "b96111a9308868303552e6b8a2322ef2ab9ee8af", "9e0161ca539c569c8624948f280fb41a56098d2e" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Nov 11 20:36:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 11 20:36:57 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\" am: 9e0161ca53\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2256436\n\nChange-Id: I5d81e9bb47eb7deff5e0fb9e00073b865151f025\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e0161ca539c569c8624948f280fb41a56098d2e", "tree": "fcc86e881b7055aba91680ce51908d88071b94ca", "parents": [ "eaff005c629dede31a811309e64852f7fe75bf0b", "aa2f1bc880ac77fa792a8dd4a82fe873fc14423f" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Fri Nov 11 20:11:13 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 11 20:11:13 2022 +0000" }, "message": "Merge \"Fix errorprone warnings that should be errors\"" }, { "commit": "aa2f1bc880ac77fa792a8dd4a82fe873fc14423f", "tree": "fcc86e881b7055aba91680ce51908d88071b94ca", "parents": [ "eaff005c629dede31a811309e64852f7fe75bf0b" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Sat Oct 15 21:33:27 2022 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Nov 10 09:43:49 2022 -0800" }, "message": "Fix errorprone warnings that should be errors\n\nThis commit is part of a large scale change to fix errorprone\nerrors that have been downgraded to warnings in the android\nsource tree, so that they can be promoted to errors again.\nThe full list of changes include the following, but not all\nwill be present in any one individual commit:\n\nBadAnnotationImplementation\nBadShiftAmount\nBanJNDI\nBoxedPrimitiveEquality\nComparableType\nComplexBooleanConstant\nCollectionToArraySafeParameter\nConditionalExpressionNumericPromotion\nDangerousLiteralNull\nDoubleBraceInitialization\nDurationFrom\nDurationTemporalUnit\nEmptyTopLevelDeclaration\nEqualsNull\nEqualsReference\nFormatString\nFromTemporalAccessor\nGetClassOnAnnotation\nGetClassOnClass\nHashtableContains\nIdentityBinaryExpression\nIdentityHashMapBoxing\nInstantTemporalUnit\nInvalidTimeZoneID\nInvalidZoneId\nIsInstanceIncompatibleType\nJUnitParameterMethodNotFound\nLockOnBoxedPrimitive\nMathRoundIntLong\nMislabeledAndroidString\nMisusedDayOfYear\nMissingSuperCall\nMisusedWeekYear\nModifyingCollectionWithItself\nNoCanIgnoreReturnValueOnClasses\nNonRuntimeAnnotation\nNullableOnContainingClass\nNullTernary\nOverridesJavaxInjectableMethod\nParcelableCreator\nPeriodFrom\nPreconditionsInvalidPlaceholder\nProtoBuilderReturnValueIgnored\nProtoFieldNullComparison\nRandomModInteger\nRectIntersectReturnValueIgnored\nReturnValueIgnored\nSelfAssignment\nSelfComparison\nSelfEquals\nSizeGreaterThanOrEqualsZero\nStringBuilderInitWithChar\nTreeToString\nTryFailThrowable\nUnnecessaryCheckNotNull\nUnusedCollectionModifiedInPlace\nXorPower\n\nSee https://errorprone.info/bugpatterns for more\ninformation on the checks.\n\nBug: 253827323\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: If22f7e827ef4d3e5766d6cc9f6a78353fbfaa60f\n" }, { "commit": "b142c5e201232e97aac9fc13dce027629a638b3d", "tree": "7b20d9a51a2b7574c6cf4de0e97512621f88213f", "parents": [ "355796f88723acb9323533bf0d0f8160a044f6c8", "7029c8801fd3284d7e5fce9302eb13b61c6b4750" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Nov 04 23:16:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 04 23:16:37 2022 +0000" }, "message": "Merge \"Update Owners file\" am: eaff005c62 am: b96111a930 am: 7029c8801f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2287834\n\nChange-Id: I6f3055a9d9025dc79b70a1bc0341a940e9eefdb6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "7029c8801fd3284d7e5fce9302eb13b61c6b4750" }