)]}' { "log": [ { "commit": "39f7f0d522a4d00a01e6abd208dcdeb8e425c973", "tree": "ebce6354f0f989510d09a5be1b2fe5724101543c", "parents": [ "0a1e44adcce0680904ca8d22eb0dda26c69fd8da", "6d1717b81a9dcc96d1d7e188f3565b398cb1a9ab" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Tue Apr 16 00:08:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 16 00:08:53 2024 +0000" }, "message": "Merge changes Iccc47e83,I163cb274 into main am: 17a51311ef am: 6d1717b81a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3034356\n\nChange-Id: I2a7b2d3ca13f542a7bad6492440300a516d4b0ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0a1e44adcce0680904ca8d22eb0dda26c69fd8da", "tree": "a49bd1ca0e76c96fa0ff656686e81a75fc86dd15", "parents": [ "1d4b882f5448eebe557af0e8babaf24b1a714885", "dd6a0864298b0e7b2f9b8033be4bec496efcfe5f" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Mon Apr 15 23:49:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 23:49:23 2024 +0000" }, "message": "[automerger skipped] Merge \"Adds back hasFlag check for DeviceState toString method\" into 24D1-dev am: dd6a086429 -s ours\n\nam skip reason: Merged-In Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d with SHA-1 eb84df6c1a is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26933891\n\nChange-Id: Ib9ab5aee2033b80a0afa9d56f88e3b368f353352\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d4b882f5448eebe557af0e8babaf24b1a714885", "tree": "a49bd1ca0e76c96fa0ff656686e81a75fc86dd15", "parents": [ "ce9397b59cda9112985121771df44fb58cfe2670", "62747e4d2b7fc15839c9c36495476eeabc9a3422" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Mon Apr 15 23:49:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 23:49:12 2024 +0000" }, "message": "[automerger skipped] Adds back hasFlag check for DeviceState toString method am: 62747e4d2b -s ours\n\nam skip reason: Merged-In Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d with SHA-1 eb84df6c1a is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26933891\n\nChange-Id: I1dc02b032ee24edfa6771549d53b5b6178653bf6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6d1717b81a9dcc96d1d7e188f3565b398cb1a9ab", "tree": "678471828d556e5665f5ae2302e52ace31dde712", "parents": [ "768a8eb80316fafbf5ff257dbea22afb70dd1649", "17a51311efcf1cd53bbcf04ca48074e741329119" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Mon Apr 15 23:44:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 23:44:01 2024 +0000" }, "message": "Merge changes Iccc47e83,I163cb274 into main am: 17a51311ef\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3034356\n\nChange-Id: Ic6964111efe039960eea53873494f4394f425214\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd6a0864298b0e7b2f9b8033be4bec496efcfe5f", "tree": "4af2c38e76c5e44677152407e77990797d11c229", "parents": [ "dc3315441d020fb20bdaf825c158c502f633952c", "62747e4d2b7fc15839c9c36495476eeabc9a3422" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Mon Apr 15 23:37:17 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:37:17 2024 +0000" }, "message": "Merge \"Adds back hasFlag check for DeviceState toString method\" into 24D1-dev" }, { "commit": "ce9397b59cda9112985121771df44fb58cfe2670", "tree": "a49bd1ca0e76c96fa0ff656686e81a75fc86dd15", "parents": [ "a102a5954f64ba237cd86e56c3eecf8f4934a371", "d2361cd6dcfe2f63dd863d62e52ca78d1f223f59" ], "author": { "name": "Yipeng Cao", "email": "tccyp@google.com", "time": "Mon Apr 15 23:33:46 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:33:46 2024 +0000" }, "message": "Merge \"Added Rubidium package into ONGOING notification allow list\" into main" }, { "commit": "a102a5954f64ba237cd86e56c3eecf8f4934a371", "tree": "9c12f12e021973e672cd3ac259c5bf4868b93af5", "parents": [ "faf1b4e6116a9f87cb296c92af77f43ab3c08aea", "6b3ff5443c6e3516cf2a97e772cec73b73a641b1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 23:33:09 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:33:09 2024 +0000" }, "message": "Merge \"VRR: Change both frame rate and category\" into main" }, { "commit": "faf1b4e6116a9f87cb296c92af77f43ab3c08aea", "tree": "ac59de7a33eea9750282066f2f6c4d6a44e88c3a", "parents": [ "3307afcc43b95b7a17352dff198bcdd9700346e2", "304a6bd1fcf06b476c4c7182fcf10b4651dd1159" ], "author": { "name": "Evan Chen", "email": "evanxinchen@google.com", "time": "Mon Apr 15 23:31:51 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:31:51 2024 +0000" }, "message": "Merge \"Fix NullPointerException for clear pending device present list\" into main" }, { "commit": "17a51311efcf1cd53bbcf04ca48074e741329119", "tree": "e6dda316563b9224b97275baa637d2ae75fad8ea", "parents": [ "b402f570f2529be1675f58ec88404c152415581c", "32637fbc2579c024c334c37315af2fd7b6d09cdb" ], "author": { "name": "Yan Yan", "email": "evitayan@google.com", "time": "Mon Apr 15 23:26:59 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 15 23:26:59 2024 +0000" }, "message": "Merge changes Iccc47e83,I163cb274 into main\n\n* changes:\n VCN: Ignore packet loss detection when there is too few traffic\n VCN: Handle sequence number leap in packet loss detector\n" }, { "commit": "3307afcc43b95b7a17352dff198bcdd9700346e2", "tree": "de796d3ec9797eb68e711d8acec417887557ed00", "parents": [ "4eeb48c6babd36970473126282696a815d62ff02", "ef914b1634b4cc5b74d1201b9ea2edb0b710567e" ], "author": { "name": "Jing Ji", "email": "jji@google.com", "time": "Mon Apr 15 23:24:01 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:24:01 2024 +0000" }, "message": "Merge \"Spawn new thread on dumping BinderProxy leaks\" into main" }, { "commit": "4eeb48c6babd36970473126282696a815d62ff02", "tree": "9523062df1710d497c0d03f33fbb4f95860e8cf0", "parents": [ "2db06b41bb6e957ae21ae45c56c91680ff0aa42a", "94be3681407ff9e3d9c305d221bf23fad5edd84f" ], "author": { "name": "Sumedh Sen", "email": "sumedhsen@google.com", "time": "Mon Apr 15 23:15:09 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:15:09 2024 +0000" }, "message": "Merge \"Remove rundundant \u003ctest\u003e tag\" into main" }, { "commit": "2db06b41bb6e957ae21ae45c56c91680ff0aa42a", "tree": "4cbd2916a7eeafa5ec6c30d453c7aca6f81b2838", "parents": [ "903a390aac4010d00902dbd7c89a757c2bbe6270", "6be4bf4566ee91c9063ef270e276e018720a9146" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 23:06:06 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 23:06:06 2024 +0000" }, "message": "Merge \"Add non-UI listener to media changes\" into main" }, { "commit": "903a390aac4010d00902dbd7c89a757c2bbe6270", "tree": "fcb4060a1d814226644a2528e96d1d6b580b5532", "parents": [ "c655da835b97ccda1c16375aaf8af9ee14b9fd3b", "93b3ee04ce46a8166ec9ffecd6cfe31178b6a81d" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 22:51:40 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:51:40 2024 +0000" }, "message": "Merge changes from topic \"am-4b5e9355355d4f6a9ac16ab1c82c7e21\" into main\n\n* changes:\n [automerger skipped] Merge \"Fix uses_libs properties for OneMedia.\" into aosp-main-future am: 768a8eb803 -s ours\n [automerger skipped] Fix uses_libs properties for OneMedia. am: ca4c93e64f -s ours\n" }, { "commit": "93b3ee04ce46a8166ec9ffecd6cfe31178b6a81d", "tree": "6f668c1648245f8c37b0901a1309da67b10f3af8", "parents": [ "6a67836de6ee6356a1a6b039c4c646e8122cc75e", "768a8eb80316fafbf5ff257dbea22afb70dd1649" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 22:51:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 22:51:12 2024 +0000" }, "message": "[automerger skipped] Merge \"Fix uses_libs properties for OneMedia.\" into aosp-main-future am: 768a8eb803 -s ours\n\nam skip reason: Merged-In I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13 with SHA-1 a401cbeeab is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26968641\n\nChange-Id: I7f8236755c6dfc18f137798e0a78532660908331\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c655da835b97ccda1c16375aaf8af9ee14b9fd3b", "tree": "fcb4060a1d814226644a2528e96d1d6b580b5532", "parents": [ "82612236d4373f801f78b8be1dc42ec0b23365f3", "4c43201d4cadec7b041845f333dce94d44e03312" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 22:51:05 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:51:05 2024 +0000" }, "message": "Merge \"Move conflated utils to shared lib\" into main" }, { "commit": "6a67836de6ee6356a1a6b039c4c646e8122cc75e", "tree": "6f668c1648245f8c37b0901a1309da67b10f3af8", "parents": [ "82612236d4373f801f78b8be1dc42ec0b23365f3", "ca4c93e64f5ef2a5a9428343ca821207d356e95b" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Mon Apr 15 22:50:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 22:50:57 2024 +0000" }, "message": "[automerger skipped] Fix uses_libs properties for OneMedia. am: ca4c93e64f -s ours\n\nam skip reason: Merged-In I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13 with SHA-1 a401cbeeab is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26968641\n\nChange-Id: Ie051bee3232504f62cfe78a5765c3fc784a8444a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "82612236d4373f801f78b8be1dc42ec0b23365f3", "tree": "6f668c1648245f8c37b0901a1309da67b10f3af8", "parents": [ "10c1e30ac9b7ab400e2b7f1d712c932735fd62d5", "32a65e8d97c35a06d29be57f3d2b86aef659765b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 22:48:58 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:48:58 2024 +0000" }, "message": "Merge \"Do not show the satellite icon when wifi is connected\" into main" }, { "commit": "10c1e30ac9b7ab400e2b7f1d712c932735fd62d5", "tree": "f4e9ade97c8b8ddc1ee25eee22dd3bc043d079f1", "parents": [ "7c15e40f06c0b04388bbbff2137dc9e7b1eaf9d6", "ee67c84b119c077a793671ec8e126bc65841c6f7" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 22:43:24 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:43:24 2024 +0000" }, "message": "Merge \"Setting up environment for media control view-binder\" into main" }, { "commit": "768a8eb80316fafbf5ff257dbea22afb70dd1649", "tree": "c47b4bd9f7507a0a5a7465220b75eb1f33c62a16", "parents": [ "528d77f32958c3a977c513d92f84d0d582bdffe4", "ca4c93e64f5ef2a5a9428343ca821207d356e95b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 22:33:29 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:33:29 2024 +0000" }, "message": "Merge \"Fix uses_libs properties for OneMedia.\" into aosp-main-future" }, { "commit": "7c15e40f06c0b04388bbbff2137dc9e7b1eaf9d6", "tree": "e275eec5240042ee4db1616430f07d82f0ebaa00", "parents": [ "e5e9c56f913857402fdc71db0c38244e5e7303fe", "443ea3ef1911a0635d331dbda687516fa1edd244" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 22:20:22 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:20:22 2024 +0000" }, "message": "Merge \"Adjust LongScreenshotActivity padding based upon system insets\" into main" }, { "commit": "e5e9c56f913857402fdc71db0c38244e5e7303fe", "tree": "e32c08f7ed16ac2485c45c96dab61d94fab82b41", "parents": [ "c918f4138966888be78e7f9c2b8677edd7a06b8d", "90c0aba83014eef909ac64126c2135fa51eede14" ], "author": { "name": "Alec Mouri", "email": "alecmouri@google.com", "time": "Mon Apr 15 22:03:18 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 22:03:18 2024 +0000" }, "message": "Merge \"Don\u0027t always send hdr headroom in SurfaceView\" into main" }, { "commit": "c918f4138966888be78e7f9c2b8677edd7a06b8d", "tree": "361a2fbc9989681bab172d1b3661621825ae1534", "parents": [ "7a03fb2cade746c2ec056ec1cd554c0d71cb9d78", "aaf26c5534f0c5185fc81e11f73c8c7c1a3066c5" ], "author": { "name": "Sherry Zhou", "email": "yuandizhou@google.com", "time": "Mon Apr 15 21:49:24 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 21:49:24 2024 +0000" }, "message": "Merge \"Remove clock id check and change them to properties of ClockConfig\" into main" }, { "commit": "6b3ff5443c6e3516cf2a97e772cec73b73a641b1", "tree": "ef4269497cb81a84075cf7469a8809bab774e419", "parents": [ "4487bc7fee2d93d1b623dd0a5bbcbe5c32b82617" ], "author": { "name": "George Mount", "email": "mount@google.com", "time": "Thu Apr 11 14:57:43 2024 -0700" }, "committer": { "name": "George Mount", "email": "mount@google.com", "time": "Mon Apr 15 14:09:46 2024 -0700" }, "message": "VRR: Change both frame rate and category\n\nBug: 299946220\n\nWhen Views vote for both a category and a\nrefresh rate, then both should be sent to\nSurfaceFlinger.\n\nNow a single View can vote for refresh rate\nand category if velocity and category are\nboth set.\n\nThis CL also reduces the overhead of voting\nby recalculating the category only one time\nrather than for every drawn View. It also\nstops Views from calculating frame rate\nand category if the maximum has already been\nset.\n\nTest: existing and new tests. manual testing\nChange-Id: Ia215d3fb0e1239f1ed88f06732d1aec13527757a\n" }, { "commit": "7a03fb2cade746c2ec056ec1cd554c0d71cb9d78", "tree": "81ed8f31c614aebd9e59c1be35743b58eefa3ce2", "parents": [ "fe51b492dc8a1067e45dbfddf24c4184621e1b80", "528d77f32958c3a977c513d92f84d0d582bdffe4" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Mon Apr 15 20:58:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:58:19 2024 +0000" }, "message": "Merge changes from topic \"punch_holes_apk\" into main am: b402f570f2 am: 528d77f329\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039899\n\nChange-Id: I842490539e661e6cddcd5b9110c08fda7e7fc1ed\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c43201d4cadec7b041845f333dce94d44e03312", "tree": "4d84f8b434d6ffb3eea0342faa5947a74c7c0bd9", "parents": [ "06cc5cc99ac9c6dd275611d819918aac2a58d7f3" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 11:41:14 2024 -0400" }, "committer": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 16:53:45 2024 -0400" }, "message": "Move conflated utils to shared lib\n\nBug: 334177468\nTest: make\nFlag: NA\nChange-Id: I3795f1c85134ffe1aba170709865c30ae2740f72\n" }, { "commit": "fe51b492dc8a1067e45dbfddf24c4184621e1b80", "tree": "2ba299795e34587128ad8350d6fab7546c4e581b", "parents": [ "7573e64bc9b383b86a6483a103055747ce0a93e8", "06cc5cc99ac9c6dd275611d819918aac2a58d7f3" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 20:51:21 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:51:21 2024 +0000" }, "message": "Merge \"Introduce channelConflated Flow builder\" into main" }, { "commit": "7573e64bc9b383b86a6483a103055747ce0a93e8", "tree": "3a470555f84eeb6c9047cb1f73ce9406205d3a63", "parents": [ "d75d4a384c8f89167813814993e441f0ed3e2836", "8065796e474b7349787de0bf6d068b864e9ab0a2" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 20:47:50 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:47:50 2024 +0000" }, "message": "Merge \"Introduce *LatestConflated Flow operators\" into main" }, { "commit": "528d77f32958c3a977c513d92f84d0d582bdffe4", "tree": "bdde3788eedc8e124cdb0607c425c690dc27dfaa", "parents": [ "44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1", "b402f570f2529be1675f58ec88404c152415581c" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Mon Apr 15 20:41:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:41:15 2024 +0000" }, "message": "Merge changes from topic \"punch_holes_apk\" into main am: b402f570f2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039899\n\nChange-Id: I18cc74f2bbdbfaf34a4c9742541fb56ddbcedcd8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d75d4a384c8f89167813814993e441f0ed3e2836", "tree": "20b4468e82e642b85cd60d3469e632c8d2569e94", "parents": [ "cd48f77bc0e9ecbe95c7b261a59c059ee68cd817", "dc3315441d020fb20bdaf825c158c502f633952c" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:33:20 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:33:20 2024 +0000" }, "message": "[automerger skipped] Merge changes from topic \"cherrypicker-L63500030002772203:N60600030045907686\" into 24D1-dev am: dc3315441d -s ours\n\nam skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44a9 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26744160\n\nChange-Id: I1f4797cd7eb1561bdb2fff6c2451f0ecf8bc479d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd48f77bc0e9ecbe95c7b261a59c059ee68cd817", "tree": "20b4468e82e642b85cd60d3469e632c8d2569e94", "parents": [ "da371d5203be3f6833c7f51df269c853e33c93d5", "8633a0d8ba37dd51c3795a30d0521fd831f9d992" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:33:09 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:33:09 2024 +0000" }, "message": "[automerger skipped] CallStyle: don\u0027t reglue icon+label if never glued am: 8633a0d8ba -s ours\n\nam skip reason: Merged-In I2160dd17d39bd00a045422e2096d14b9ebb68902 with SHA-1 7f5aea44a9 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26744160\n\nChange-Id: I63363035f4203b907abc6838a96509fb9e601a89\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da371d5203be3f6833c7f51df269c853e33c93d5", "tree": "20b4468e82e642b85cd60d3469e632c8d2569e94", "parents": [ "2bafaa1195a55ef2bf7636f1341a417076d4e8da", "f2d695e6d698e74c99545a9f0ec285a4b996fc99" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:31:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:31:29 2024 +0000" }, "message": "[automerger skipped] Merge changes from topic \"cherrypicker-L46800030003199711:N12400030051438895\" into 24D1-dev am: f2d695e6d6 -s ours\n\nam skip reason: Merged-In I8c472541ad4c9115480100cf6c05ab02f09f198e with SHA-1 047546e21f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26968422\n\nChange-Id: Ibb5bf40070eb152d06bae14b6ce5e7a05a66a70d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2bafaa1195a55ef2bf7636f1341a417076d4e8da", "tree": "20b4468e82e642b85cd60d3469e632c8d2569e94", "parents": [ "8306040f37270d183d213b0cba422867e15c5b89", "4dbe7a4cebc6af94e05c5b0d7b9507f0eb298c93" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:31:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:31:16 2024 +0000" }, "message": "[automerger skipped] NSSL: requestLayout on split shade change am: 4dbe7a4ceb -s ours\n\nam skip reason: Merged-In I8c472541ad4c9115480100cf6c05ab02f09f198e with SHA-1 047546e21f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26968422\n\nChange-Id: Ifa42f403804efb6b532bd9113a33c7a4cb62abc1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8306040f37270d183d213b0cba422867e15c5b89", "tree": "20b4468e82e642b85cd60d3469e632c8d2569e94", "parents": [ "3931f8dc22351192310f5e4479535464b226521e", "5ab03d2c36d38907e53875572ea3ddb6c7d090ef" ], "author": { "name": "Reema Bajwa", "email": "reemabajwa@google.com", "time": "Mon Apr 15 20:30:49 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:30:49 2024 +0000" }, "message": "Merge \"Pass crypto object to biometric prompt\" into main" }, { "commit": "3931f8dc22351192310f5e4479535464b226521e", "tree": "405af7cdce102100c6fe73c8520e41697db43e44", "parents": [ "f1f925bde5e0b8ce5269bfb753a92f78cd76d129", "2792547d4b48a9781a6a45a8f38f9ab2317e1b19" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:29:52 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 20:29:52 2024 +0000" }, "message": "[automerger skipped] ChannelEditorDialog: use @dimen/large_dialog_width am: 2792547d4b -s ours\n\nam skip reason: Merged-In Ic3871b721b9ecf37abc6d92b0378003806f20ff2 with SHA-1 f47606f122 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26970137\n\nChange-Id: I502f0fd9af3aca920346341f6d35fe4320da5c43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1f925bde5e0b8ce5269bfb753a92f78cd76d129", "tree": "405af7cdce102100c6fe73c8520e41697db43e44", "parents": [ "8a7b789929618e6636315de01628c3bfcf1d2b49", "5c3e8160d775334c55fc70360361063c2f6b3f0c" ], "author": { "name": "Reema Bajwa", "email": "reemabajwa@google.com", "time": "Mon Apr 15 20:26:00 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:26:00 2024 +0000" }, "message": "Merge \"Change the back button to close button on more options page\" into main" }, { "commit": "b402f570f2529be1675f58ec88404c152415581c", "tree": "bdde3788eedc8e124cdb0607c425c690dc27dfaa", "parents": [ "23311d456a77417fa9607029b369f6ce73a376b4", "2724e0f6fdc5807b9d195556b7dbfd19a83d2a09" ], "author": { "name": "Pawan Wagh", "email": "waghpawan@google.com", "time": "Mon Apr 15 20:25:43 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 15 20:25:43 2024 +0000" }, "message": "Merge changes from topic \"punch_holes_apk\" into main\n\n* changes:\n Punch extracted ELF64 files\n Punch holes in extra field in local headers inside apk\n Add Extra field info in ZipFileRO\n" }, { "commit": "8a7b789929618e6636315de01628c3bfcf1d2b49", "tree": "eec25d7f4f183355c93ef5886c2172dd75506bf6", "parents": [ "db3f9172a5067870e31c2e0678b3ce062ed731f7", "b92621bb071be1d4b5a10db9a3d98d9f32376a88" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Apr 15 20:18:43 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:18:43 2024 +0000" }, "message": "Merge \"Log when audio attributes are corrected\" into main" }, { "commit": "db3f9172a5067870e31c2e0678b3ce062ed731f7", "tree": "0b02f254095681fb6101efcd9292a01ae74ff49b", "parents": [ "52f0959402e50c1b96b088e8b629806d212db374", "3da8264d53b4e5f1598ff1a47f848ab10bd67b49" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Apr 15 20:18:16 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:18:16 2024 +0000" }, "message": "Merge \"Check all apps for fixed permission status\" into main" }, { "commit": "dc3315441d020fb20bdaf825c158c502f633952c", "tree": "85e244009b9390e2e53eb200cb889c296919ecb2", "parents": [ "f2d695e6d698e74c99545a9f0ec285a4b996fc99", "8633a0d8ba37dd51c3795a30d0521fd831f9d992" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:17:16 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:17:16 2024 +0000" }, "message": "Merge changes from topic \"cherrypicker-L63500030002772203:N60600030045907686\" into 24D1-dev\n\n* changes:\n CallStyle: don\u0027t reglue icon+label if never glued\n CallStyle: Also handle null label to glue\n CallStyle: Handle null icon to glue\n" }, { "commit": "62747e4d2b7fc15839c9c36495476eeabc9a3422", "tree": "3c16c87e1dd9ec6220416909115d5fa36d68c823", "parents": [ "bb338d7a969c7f45b88586bf075a6176980aa812" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Thu Apr 04 16:37:30 2024 +0000" }, "committer": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Mon Apr 15 20:15:25 2024 +0000" }, "message": "Adds back hasFlag check for DeviceState toString method\n\nCts uses the output from DeviceState toString to determine\nif certain states should not be used\n\nBug: 330658669\nTest: Manual toString check\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7303ab84104cce1136886c61137b1af90c29cb97)\nMerged-In: I94cd8ea4f53e42190789b1460987fc7bc855e01f\nMerged-In: Iadeb933fb5e5be1ef255fb2ca9fcc69c12147d7d\nChange-Id: I94cd8ea4f53e42190789b1460987fc7bc855e01f\n24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.\n" }, { "commit": "f2d695e6d698e74c99545a9f0ec285a4b996fc99", "tree": "0c0f8142e0f6ab789c104831bf3c5cec66d075b2", "parents": [ "2792547d4b48a9781a6a45a8f38f9ab2317e1b19", "4dbe7a4cebc6af94e05c5b0d7b9507f0eb298c93" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Apr 15 20:14:18 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:14:18 2024 +0000" }, "message": "Merge changes from topic \"cherrypicker-L46800030003199711:N12400030051438895\" into 24D1-dev\n\n* changes:\n NSSL: requestLayout on split shade change\n NSSL: Apply skinny notifs based on split shade state\n NSSL: Log more about side padding decisions\n NSSL: Log actual orientation on updateSidePadding\n" }, { "commit": "52f0959402e50c1b96b088e8b629806d212db374", "tree": "a71992c115a5847a76c379dc5683d7ea694545a8", "parents": [ "9fac59abf7b4a702227e14d6f443118316533dc5", "b4ce9161108d569fab1d20f00ebce4ddb43b1c4a" ], "author": { "name": "Ale Nijamkin", "email": "nijamkin@google.com", "time": "Mon Apr 15 20:11:59 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 20:11:59 2024 +0000" }, "message": "Merge \"[flexiglass] Unfold transition support in the shade scene.\" into main" }, { "commit": "ee67c84b119c077a793671ec8e126bc65841c6f7", "tree": "14ed202b8a75ac8f74825ea3e76788c9a795f85a", "parents": [ "829ab8b52c79385c1311e39a7e9d9adb9cf7132c" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 08 15:46:11 2024 +0000" }, "committer": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 20:04:13 2024 +0000" }, "message": "Setting up environment for media control view-binder\n\nAdds seek bar view model work, and modify some fields in view-models.\n\nFlag: ACONFIG media_controls_refactor DISABLED\nBug: 328207006\nTest: atest SystemUiRoboTests:MediaControlViewModelTest\nTest: build.\nChange-Id: I62e5caee4958b1f27c5a0337c53aea4f691e4f16\n" }, { "commit": "9fac59abf7b4a702227e14d6f443118316533dc5", "tree": "0f1feb1785fed953da10590bbcb4df54089442df", "parents": [ "18eb06682b773b748e44677896b325e0ff4b01d0", "e9c77b8abb8f97e6aafddc073aae8291659f982d" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Mon Apr 15 19:58:05 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 19:58:05 2024 +0000" }, "message": "Merge \"Only update udfps view params if addViewRunnable IS null\" into main" }, { "commit": "18eb06682b773b748e44677896b325e0ff4b01d0", "tree": "d4748f70bd9cd2650d8dfc6daf8d05e6cfca2f55", "parents": [ "4b4854d2ac2c172966c3488622f815564991cdc1", "24602011ad3c835163e4a3a982a5c807af8c9eea" ], "author": { "name": "Beverly Tai", "email": "beverlyt@google.com", "time": "Mon Apr 15 19:56:56 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 19:56:56 2024 +0000" }, "message": "Merge \"Only consider notification launches from keyguard in KeyguardSurfaceBehindInteractor\" into main" }, { "commit": "4b4854d2ac2c172966c3488622f815564991cdc1", "tree": "9c64248ac35a4269df63102c94869b322288e745", "parents": [ "b28430af138de1c127c83547dfa555634f394483", "0b372f678d10df4b5aba93ac1f6df10018132cd2" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 19:24:16 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 19:24:16 2024 +0000" }, "message": "Merge \"Use media data processor methods internally\" into main" }, { "commit": "304a6bd1fcf06b476c4c7182fcf10b4651dd1159", "tree": "fd8924e16d145ef82271af72e8706495c23dfff9", "parents": [ "b83de0bcf7f9aa4544dc3a2408e7cc642244585d" ], "author": { "name": "Evan Chen", "email": "evanxinchen@google.com", "time": "Sat Apr 13 05:25:16 2024 +0000" }, "committer": { "name": "Evan Chen", "email": "evanxinchen@google.com", "time": "Mon Apr 15 18:41:05 2024 +0000" }, "message": "Fix NullPointerException for clear pending device present list\n\nBug: 326458463\nFix: 334639930\nTest: CTS + Manual\nChange-Id: I7b8600f1ef8e33e9b89fedd177f89efc9ffd11ad\n" }, { "commit": "b28430af138de1c127c83547dfa555634f394483", "tree": "85c9985e40d728fe7cb034475b4239698c0513dd", "parents": [ "789d8b5466e3ed284bd2dc91c5c29241bf5454f0", "733f3afefd8af2f5fa31fa45992e3087386820c4" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Mon Apr 15 18:01:41 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 18:01:41 2024 +0000" }, "message": "Merge \"New help info for cmd device_config\" into main" }, { "commit": "789d8b5466e3ed284bd2dc91c5c29241bf5454f0", "tree": "f913ac2f1ccdfbb51b07e1559025c41844772a10", "parents": [ "1699048dfd26367a52ea79d7196fb6b004652cd3", "bf913e2977ace85fc4f79d54aa00a644f121bc72" ], "author": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Mon Apr 15 17:58:07 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:58:07 2024 +0000" }, "message": "Merge \"Use moved GrBackendDrawableInfo.h file\" into main" }, { "commit": "1699048dfd26367a52ea79d7196fb6b004652cd3", "tree": "0eeacd00148b5b843728a9f696c3d0566f456fa7", "parents": [ "84daf1b777a0ad49a6c651c54fba1fd02c55050e", "a63d809bd17eb7b0e20b3116e1e4df58b4ec173d" ], "author": { "name": "Leon Scroggins", "email": "scroggo@google.com", "time": "Mon Apr 15 17:55:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:55:31 2024 +0000" }, "message": "Merge \"[base] Use public version of SkMultiPictureDocument.h\" into main" }, { "commit": "84daf1b777a0ad49a6c651c54fba1fd02c55050e", "tree": "4bc59ee9ed774c9b21274b6b2392eb54d178f98b", "parents": [ "d6aa794e3266fa4d4d8e05e8f90208a20527d211", "6171c37145448eab3db5e384beb3eb3cace6b3c6" ], "author": { "name": "Antonio Kantek", "email": "kanant@google.com", "time": "Mon Apr 15 17:54:28 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:54:28 2024 +0000" }, "message": "Merge \"Remove unnecessary query in IMMS#switchUserOnHandlerLocked() (2nd try)\" into main" }, { "commit": "d6aa794e3266fa4d4d8e05e8f90208a20527d211", "tree": "20d3a82978be9b33ea0f5809f1dcb667bf300dab", "parents": [ "12f99930cc26cdc40259b3afc95fa7ab93c396f6", "a077feeb53e82ab1f7f020710f5e37da558578ba" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 17:53:41 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:53:41 2024 +0000" }, "message": "Merge \"Remove redundant call of queryInputMethodServicesInternal (2nd try)\" into main" }, { "commit": "12f99930cc26cdc40259b3afc95fa7ab93c396f6", "tree": "f8fdf42bcd0894b95a926b8c6ffed5a2834f4020", "parents": [ "771a4e9bb1e6abb0097d6cc56ff3978099c0ec27", "afe50c04c1ee12d054f1d5db8c8c580da71ec9a0" ], "author": { "name": "Abdullah Tabassum", "email": "abdullahirum@google.com", "time": "Mon Apr 15 17:36:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 17:36:28 2024 +0000" }, "message": "Merge \"Adjust wallpaper during B\u0026R to center align\" into 24D1-dev am: afe50c04c1\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26668148\n\nChange-Id: I0dee757e4e9bf77e87920530c9f6ae4dda962ab1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "771a4e9bb1e6abb0097d6cc56ff3978099c0ec27", "tree": "d16fdd969930bad8e21aa2ee9581a9a5113bc525", "parents": [ "dd18a8d9f399fc20d97dbea6717b8fd153201184", "948b9b0798d0af4b4f346075c253ac1def5e19d4" ], "author": { "name": "Jonathan Backer", "email": "backer@google.com", "time": "Mon Apr 15 17:16:10 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:16:10 2024 +0000" }, "message": "Merge \"Fix kernel wakeup durations\" into main" }, { "commit": "4dbe7a4cebc6af94e05c5b0d7b9507f0eb298c93", "tree": "1b965fc38299aff0bbd5e9da36a52493263d33af", "parents": [ "dfc4a0dd875d938e2a8ab735c611b007f49060f3" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Fri Mar 08 19:32:39 2024 -0500" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 17:15:16 2024 +0000" }, "message": "NSSL: requestLayout on split shade change\n\nSince the side padding can change based on the split shade state, and\nsince the split shade state can change independently of configuration\nchanges, and since I\u0027m just kinda skeptical of the sequence of events\nhere, explicitly request a layout pass when the split shade state\nchanges.\n\nBug: 328588062\nTest: postsubmit\nFlag: NA\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:047546e21f8ccabc412237a353e0de2b10c43328)\nMerged-In: I8c472541ad4c9115480100cf6c05ab02f09f198e\nChange-Id: I8c472541ad4c9115480100cf6c05ab02f09f198e\n" }, { "commit": "dfc4a0dd875d938e2a8ab735c611b007f49060f3", "tree": "986f46b41d3da6269d66d29375a7b3f8c2a19321", "parents": [ "92d95cfae896b3bc0e47f6eb2f0f6d2e4f1785ea" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Fri Mar 08 19:31:22 2024 -0500" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 17:15:06 2024 +0000" }, "message": "NSSL: Apply skinny notifs based on split shade state\n\nCurrently, we\u0027re relying on some complex config/resource logic to decide\nwhether to use the skinny notif layout, and it seems like it might be\nflaky.\n\nTherefore, check *directly* whether NSSL should use the split shade, and\nuse *that* to decide whether to use the skinny notif layout.\n\nBug: 328588062\nTest: postsubmit\nFlag: NA\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13203c2c38032acdc85f4927922179712ff60bc4)\nMerged-In: Iaeb97db2e4808cbec131019a2f2dcc6a679fa642\nChange-Id: Iaeb97db2e4808cbec131019a2f2dcc6a679fa642\n" }, { "commit": "92d95cfae896b3bc0e47f6eb2f0f6d2e4f1785ea", "tree": "7d828dfd975dcbb2eeb2050923e983fc76bcc3bb", "parents": [ "62f4d08d7472cbf7b602aaedc1b3f0e25f0075f5" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Fri Mar 08 16:44:07 2024 -0500" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 17:14:56 2024 +0000" }, "message": "NSSL: Log more about side padding decisions\n\nTurns out that updateSidePadding doesn\u0027t tell the whole story, so\ncollect and dump *all* all of the inputs.\n\nBug: 328588062\nTest: manual\nFlag: NA\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:73ba75733e799f362fbb246ec5cfbefcb4577254)\nMerged-In: I90cb8b1c757faf9667e7d8acd877c7f17100ff5d\nChange-Id: I90cb8b1c757faf9667e7d8acd877c7f17100ff5d\n" }, { "commit": "62f4d08d7472cbf7b602aaedc1b3f0e25f0075f5", "tree": "042e2b9f2323a4312f9acf6e28a15dfa184d525a", "parents": [ "afe50c04c1ee12d054f1d5db8c8c580da71ec9a0" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Thu Feb 29 15:14:30 2024 -0500" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 17:14:46 2024 +0000" }, "message": "NSSL: Log actual orientation on updateSidePadding\n\nBug: 326447757\nTest: NA\nFlag: NA\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c14c9d94bbe8a7701cade7c2a5e2bb3b69f4102)\nMerged-In: I97375eacf9e566f68a440ed019a559693dd51450\nChange-Id: I97375eacf9e566f68a440ed019a559693dd51450\n" }, { "commit": "2792547d4b48a9781a6a45a8f38f9ab2317e1b19", "tree": "07d53960a778aee26fa4856c0ff79fd0eafe6732", "parents": [ "afe50c04c1ee12d054f1d5db8c8c580da71ec9a0" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Mon Feb 26 15:48:23 2024 -0500" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 17:12:42 2024 +0000" }, "message": "ChannelEditorDialog: use @dimen/large_dialog_width\n\nChannelEditorDialog (which uses notif_half_shelf as the root layout) was\ndisplaying with layout_width wrap_content, which meant the dialog was\nsnugly wrapped around the app icon, name, and global notification\ntoggle.\n\nWe already have a convenient resource, @dimen/large_dialog_width, for\ndialogs like this, so use it!\n\nBug: 309133675\nFlag: NA\nTest: manual\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f47606f122049bd73ce39b1e449cbda794a74395)\nMerged-In: Ic3871b721b9ecf37abc6d92b0378003806f20ff2\nChange-Id: Ic3871b721b9ecf37abc6d92b0378003806f20ff2\n" }, { "commit": "dd18a8d9f399fc20d97dbea6717b8fd153201184", "tree": "a141db52a7a4c77cac60659865943cc442ea0256", "parents": [ "ea738bfa21d63849df85a163bc10e6a2f5e67d06", "15428cc8dee91afd157f122c15aed845aa334a05" ], "author": { "name": "Ahaan Ugale", "email": "augale@google.com", "time": "Mon Apr 15 17:09:38 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:09:38 2024 +0000" }, "message": "Merge \"Fix sensitive content Toast for multiple windows in same activity\" into main" }, { "commit": "ea738bfa21d63849df85a163bc10e6a2f5e67d06", "tree": "fb8d3c43714caca7a4c00d69f3e3271f77a8da39", "parents": [ "b9070b2fed53facbab947e7d07f7824bb3a6a53e", "f0b1c03e39d46c5629a8a8556c9bc3f36da96166" ], "author": { "name": "Ashish Kumar Gupta", "email": "kumarashishg@google.com", "time": "Mon Apr 15 17:05:29 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 17:05:29 2024 +0000" }, "message": "Merge \"Handle the edge to edge problem\" into main" }, { "commit": "afe50c04c1ee12d054f1d5db8c8c580da71ec9a0", "tree": "71d021a2de8112064a22adb49e3a70f4d3c4fafc", "parents": [ "bab84f3277a017b25dfdd12f7688b961a8e32cd0", "60e5458981d53e55762da5bb2c1179175e9d0711" ], "author": { "name": "Abdullah Tabassum", "email": "abdullahirum@google.com", "time": "Mon Apr 15 16:53:28 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 16:53:28 2024 +0000" }, "message": "Merge \"Adjust wallpaper during B\u0026R to center align\" into 24D1-dev" }, { "commit": "b9070b2fed53facbab947e7d07f7824bb3a6a53e", "tree": "43f482b37f122db4c2a231c6b3aadc51b31ec89d", "parents": [ "0e75605d0cf7cb1537fe6920ddae5019e6017998", "f80cd7634de4d7a1ecff34bc695a9d7ca904387d" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Mon Apr 15 16:44:05 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 16:44:05 2024 +0000" }, "message": "Merge \"Fix crash loop with back handler\" into main" }, { "commit": "f80cd7634de4d7a1ecff34bc695a9d7ca904387d", "tree": "b2e06d1347ecbdc090fb987150dc83ba7db6216c", "parents": [ "db03730bb962bc5f26004f256e5b4f8c99247e40" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Fri Apr 12 10:46:28 2024 -0700" }, "committer": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Mon Apr 15 16:43:49 2024 +0000" }, "message": "Fix crash loop with back handler\n\nSTL throws an exception if there is no back handler.\n\nFixes: 334082824\nTest: flexiglass reset\nTest: boot up system ui and ensure that no crash looping.\nFlag: ACONFIG com.android.systemui.compose_lockscreen DEVELOPMENT\n\nChange-Id: I9e3b8ab9a9332c285e2ef2ad2edf8588bb5b56af\n" }, { "commit": "b4ce9161108d569fab1d20f00ebce4ddb43b1c4a", "tree": "198adcccd0991f410a44a71f8dc92199667c9d51", "parents": [ "494471037600ac98e538a1bd07df8ad026a78b29" ], "author": { "name": "Alejandro Nijamkin", "email": "nijamkin@google.com", "time": "Fri Apr 12 12:56:19 2024 -0700" }, "committer": { "name": "Alejandro Nijamkin", "email": "nijamkin@google.com", "time": "Mon Apr 15 09:39:58 2024 -0700" }, "message": "[flexiglass] Unfold transition support in the shade scene.\n\nWhen a foldable is fully unfolded and then the user begins to fold it\nup, there\u0027s a subtle animation that happens to elements across the\nscreen. Left-hand side elements move to the right and right-hand side\nelements move to the left, seeming to gently float towards the fold\nhinge.\n\nThis CL adds that for Flexiglass, only for the (split) shade scene.\n\nTest: added unit and integration tests for the new code that exposes the\nunfoldProgress\nTest: manually verified that gently folding up the device correctly\nslides the elements of the split shade into the center (true for the\nleft-hand QS side and status bar, but needs more work for the\nnotifications side, even though the code applies the translation it\u0027s\nnot happening yet)\nFlag: ACONFIG com.android.systemui.scene_container DEVELOPMENT\nBug: 330483283\n\nChange-Id: I91db7922e824ee106faa96709b069f5b862aa7de\n" }, { "commit": "6be4bf4566ee91c9063ef270e276e018720a9146", "tree": "022cf3563fb38b1a289f7377ac40d044e67c5d7e", "parents": [ "0b372f678d10df4b5aba93ac1f6df10018132cd2" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 14:28:10 2024 +0000" }, "committer": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 16:29:40 2024 +0000" }, "message": "Add non-UI listener to media changes\n\nFlag: ACONFIG media_controls_refactor DISABLED\nBug: 326281896\nTest: atest MediaDataFilterImplTest\nChange-Id: Id9a53bf44d2c059bb72294b274c56dba4dd83d4b\n" }, { "commit": "ca4c93e64f5ef2a5a9428343ca821207d356e95b", "tree": "72335a971002ec8dcdca88490b2971bc7bcdb7c0", "parents": [ "44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1" ], "author": { "name": "Jiakai Zhang", "email": "jiakaiz@google.com", "time": "Tue Apr 02 16:54:50 2024 +0100" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Apr 15 16:26:41 2024 +0000" }, "message": "Fix uses_libs properties for OneMedia.\n\nBug: 331528424\nTest: m OneMedia\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a401cbeeabfaece70150e7fc9ab41a2b9f02dd81)\nMerged-In: I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13\nChange-Id: I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13\n" }, { "commit": "32a65e8d97c35a06d29be57f3d2b86aef659765b", "tree": "977917e0620d6be4b682d30c2d32053e5fe5fcc8", "parents": [ "df3ce9de47b0217311d0ae417c9d777633416b73" ], "author": { "name": "Olivier St-Onge", "email": "ostonge@google.com", "time": "Fri Apr 12 08:14:13 2024 -0400" }, "committer": { "name": "Olivier St-Onge", "email": "ostonge@google.com", "time": "Mon Apr 15 12:19:30 2024 -0400" }, "message": "Do not show the satellite icon when wifi is connected\n\nFlag: none\nBug: 329032378\nTest: DeviceBasedSatelliteInteractorTest\nTest: DeviceBasedSatelliteViewModelTest\nChange-Id: I920b1b37be24fe77ed17e160e85ccea5ac82ebca\n" }, { "commit": "8633a0d8ba37dd51c3795a30d0521fd831f9d992", "tree": "0b1f4d9c122ce7f8f37a5e316e384140f79dd94e", "parents": [ "ce4282019cbacc9c7a9bd59093866ad6065ed2b1" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Fri Mar 22 12:14:45 2024 -0400" }, "committer": { "name": "David Lin", "email": "dlinls@google.com", "time": "Mon Apr 15 16:07:58 2024 +0000" }, "message": "CallStyle: don\u0027t reglue icon+label if never glued\n\nEmphasizedNotificationButton has two ways of rendering the icon and\nlabel:\n\n1. Unglued, where they\u0027re set using View\u0027s standard methods.\n\n2. Glued, where they\u0027re saved and combined into a single Spannable with\n an ImageSpan for the icon.\n\nA small logic error meant that we were \"re-gluing\" the icon and label on\nlayout direction updates *even if they weren\u0027t glued to start with*, and\ngluing a null icon and label gives a blank button instead of the label\nthe caller already set.\n\nBug: \u003c330746629\u003e\nTest: atest NotificationEmphasizedButtonState\nFlag: NA\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f5aea44a97747dbd699c82dea42e21369a439b4)\nMerged-In: I2160dd17d39bd00a045422e2096d14b9ebb68902\nChange-Id: I2160dd17d39bd00a045422e2096d14b9ebb68902\n24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.\n" }, { "commit": "ce4282019cbacc9c7a9bd59093866ad6065ed2b1", "tree": "5771d5e2d1be01d812be74048de2ed981b69d6d6", "parents": [ "e18b2958b09a12ce8b441a6c06c95af8f5366435" ], "author": { "name": "Julia Tuttle", "email": "juliatuttle@google.com", "time": "Tue Mar 19 15:16:45 2024 -0400" }, "committer": { "name": "David Lin", "email": "dlinls@google.com", "time": "Mon Apr 15 16:06:25 2024 +0000" }, "message": "CallStyle: Also handle null label to glue\n\nBug: \u003c329288442\u003e\nFlag: ACONFIG com.android.systemui.new_call_style_action_layout NEXTFOOD\nTest: none\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:614da108d8e4259ad925a437830408e83b6c3979)\nMerged-In: Ib8958198aa7e99b0db54834602ecf4767146c560\nChange-Id: Ib8958198aa7e99b0db54834602ecf4767146c560\n24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.\n" }, { "commit": "06cc5cc99ac9c6dd275611d819918aac2a58d7f3", "tree": "432559860490e5533e1e604edfa72e98f19d3371", "parents": [ "8065796e474b7349787de0bf6d068b864e9ab0a2" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 11:34:22 2024 -0400" }, "committer": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 12:00:26 2024 -0400" }, "message": "Introduce channelConflated Flow builder\n\nBug: 334177468\nTest: NA\nFlag: NA\nChange-Id: Ibb9057b40ac9e540431df3ccb4fc87324408a8a5\n" }, { "commit": "8065796e474b7349787de0bf6d068b864e9ab0a2", "tree": "76cfb8e55c4261dc6b695c8e1340b8607e89fc82", "parents": [ "33b336fb01110b4d2f961fbe3bbcee6d780c9871" ], "author": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 11:02:52 2024 -0400" }, "committer": { "name": "Steve Elliott", "email": "steell@google.com", "time": "Mon Apr 15 11:59:48 2024 -0400" }, "message": "Introduce *LatestConflated Flow operators\n\nThese are meant to replace the standard *Latest Flow operators, as it\nprovides more sensible and performant defaults for sysui developers.\n\nFlag: NA\nBug: 334177468\nTest: NA\nChange-Id: I944a98e96a7f073d9ee5220f7eeab61c5ded3a8e\n" }, { "commit": "d2361cd6dcfe2f63dd863d62e52ca78d1f223f59", "tree": "f572b94312420fa2803e559ed3988b1fa653080f", "parents": [ "1ec8d1bf7ca6152000d341d15a8cea519bc6fa97" ], "author": { "name": "Yipeng Cao", "email": "tccyp@google.com", "time": "Wed Mar 27 11:12:05 2024 -0700" }, "committer": { "name": "Yipeng Cao", "email": "tccyp@google.com", "time": "Mon Apr 15 08:59:47 2024 -0700" }, "message": "Added Rubidium package into ONGOING notification allow list\n\nTest: atest FrameworksUiServicesTests\nBug: 331230019\n\nChange-Id: I148d26ef4c2fe3572d72567eaa539492fe350f71\n" }, { "commit": "3da8264d53b4e5f1598ff1a47f848ab10bd67b49", "tree": "67318277f4d3204e88d9e47092d2c25e6358e2e5", "parents": [ "0e75605d0cf7cb1537fe6920ddae5019e6017998" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Apr 15 11:13:24 2024 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Mon Apr 15 15:20:43 2024 +0000" }, "message": "Check all apps for fixed permission status\n\nPolicy changes can be applied to all apps, not just system apps,\nso remove the system apps filter.\n\nTest: PreferencesHelperTest\nTest: manual with testdpc\nFixes: 316825429\nChange-Id: Ie097d2e903c8bb4fb18eb9a63fd18db7dd1db56b\n" }, { "commit": "0b372f678d10df4b5aba93ac1f6df10018132cd2", "tree": "af7a5095799c2ec401d6a1477ccd53d8af3b95b1", "parents": [ "0e75605d0cf7cb1537fe6920ddae5019e6017998" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 10:40:45 2024 +0000" }, "committer": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 14:34:04 2024 +0000" }, "message": "Use media data processor methods internally\n\nSince we have a new implementation for MediaDataFilter, we can call\nmethods from MediaDataProcessor instead of the legacy MediaDataManager.\n\nFlag: ACONFIG media_controls_refactor DISABLED\nBug: 326281896\nTest: Build.\nTest: atest MediaDataFilterImplTest.\nChange-Id: Ic06bb4db9dbd42bfe869177ddf40676a4d511b96\n" }, { "commit": "948b9b0798d0af4b4f346075c253ac1def5e19d4", "tree": "d3468580faaeea33e582237d4251880f3f13146b", "parents": [ "0e75605d0cf7cb1537fe6920ddae5019e6017998" ], "author": { "name": "Jonathan Backer", "email": "backer@google.com", "time": "Wed Apr 10 09:23:12 2024 -0400" }, "committer": { "name": "Jonathan Backer", "email": "backer@google.com", "time": "Mon Apr 15 10:03:45 2024 -0400" }, "message": "Fix kernel wakeup durations\n\nBefore this change, atom KERNEL_WAKEUP_REPORTED recorded the uptime from\nkernel wake to first partial wakelock started.\n\nWith this change, atom KERNEL_WAKEUP_REPORTED records the complete uptime\nassociated with the kernel wake.\n\nThere is significant CPU scheduling delay on WearOS devices due to\nCPU starvation (go/wear-metric-problem). This means that a thread hop\ncan take take a large amount of wall time.\n\nAs per b/309610775#comment9, the calls to aggreateWakeupReasonLocked by\nnoteWakeupReasonLocked and noteStartWakeLocked are racing and potential\nscheduling delays can really skew the order.\n\nTest: ./out/host/linux-x86/bin/statsd_testdrive -e 36\n\nBug: 309610775\nChange-Id: I8ec939e00d1535da4bdcd3a1aa0e028424ef97e4\n" }, { "commit": "0e75605d0cf7cb1537fe6920ddae5019e6017998", "tree": "f9e6b1ba6913f1b44a9c1949b4671a3878fd5222", "parents": [ "3f0f5cabe57bdc2368257d72b9aa6f981a4a1e8d", "bab84f3277a017b25dfdd12f7688b961a8e32cd0" ], "author": { "name": "Matt Casey", "email": "mrcasey@google.com", "time": "Mon Apr 15 13:34:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 13:34:50 2024 +0000" }, "message": "[automerger skipped] Merge changes I47e07f87,I9f3542d6,I3c5cae3f into 24D1-dev am: bab84f3277 -s ours\n\nam skip reason: Merged-In I47e07f87242273bd6463b01783c4b9fafa97e391 with SHA-1 93ca7c45c2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26944772\n\nChange-Id: If0561b3edd1c990c3eeacb1ad20dada3a8f3d21d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f0f5cabe57bdc2368257d72b9aa6f981a4a1e8d", "tree": "f9e6b1ba6913f1b44a9c1949b4671a3878fd5222", "parents": [ "42f1e793dec5d7be413bbb07e77082eddbfeb2a6", "4138456754f988af91fc9b694603cafe7b80d556" ], "author": { "name": "Miranda Kephart", "email": "mkephart@google.com", "time": "Mon Apr 15 13:34:24 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 13:34:24 2024 +0000" }, "message": "[automerger skipped] Allow touches to pass through screenshot shelf view am: 4138456754 -s ours\n\nam skip reason: Merged-In I47e07f87242273bd6463b01783c4b9fafa97e391 with SHA-1 93ca7c45c2 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26944772\n\nChange-Id: Ic8a54b6f8b33044a10646c5cd80754e89187563a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e9c77b8abb8f97e6aafddc073aae8291659f982d", "tree": "be61f415ab9276048811967b64c0d3037e62cfab", "parents": [ "2adb2e4f417a04777378f64076b33c761fc9e36c" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Apr 15 13:33:09 2024 +0000" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Apr 15 13:33:09 2024 +0000" }, "message": "Only update udfps view params if addViewRunnable IS null\n\nWhen addViewRunnable is null, this means there\u0027s no pending view.\nPreviously we were checking for the exact opposite by mistake.\n\nFixes: 333180884\nFlag: ACONFIG com.android.systemui.udfps_view_performance NEXTFOOD\nFlag: ACONFIG com.android.systemui.device_entry_udfps_refactor TRUNKFOOD\nTest: atest UdfpsControllerOverlayTest\nChange-Id: I2441e5840878c852f7519fc47bd620f692e4aa93\n" }, { "commit": "42f1e793dec5d7be413bbb07e77082eddbfeb2a6", "tree": "f9e6b1ba6913f1b44a9c1949b4671a3878fd5222", "parents": [ "df3ce9de47b0217311d0ae417c9d777633416b73", "ab4b036fc5f14383269d27a14432c9e984efc480" ], "author": { "name": "Justin Weir", "email": "justinweir@google.com", "time": "Mon Apr 15 13:24:57 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 13:24:57 2024 +0000" }, "message": "Merge \"Delete SceneContainerFlags\" into main" }, { "commit": "bab84f3277a017b25dfdd12f7688b961a8e32cd0", "tree": "b1bec309ea527836a3753a0ab769581eec7d41cf", "parents": [ "dab290ec08d717cc501d8908ca47c6740bd6785c", "4138456754f988af91fc9b694603cafe7b80d556" ], "author": { "name": "Matt Casey", "email": "mrcasey@google.com", "time": "Mon Apr 15 13:14:48 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 13:14:48 2024 +0000" }, "message": "Merge changes I47e07f87,I9f3542d6,I3c5cae3f into 24D1-dev\n\n* changes:\n Allow touches to pass through screenshot shelf view\n Call back ScreenshotActionsProvider with null content if none is available.\n Allow action visibility to be toggled.\n" }, { "commit": "24602011ad3c835163e4a3a982a5c807af8c9eea", "tree": "7f5922a4be4f435251862b182f2c098ea31fbfde", "parents": [ "2adb2e4f417a04777378f64076b33c761fc9e36c" ], "author": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Fri Apr 12 19:22:17 2024 +0000" }, "committer": { "name": "Beverly", "email": "beverlyt@google.com", "time": "Mon Apr 15 13:07:14 2024 +0000" }, "message": "Only consider notification launches from keyguard in KeyguardSurfaceBehindInteractor\n\nTo avoid showing the keyguard unnecessarily when launching a\nnotification intent from the keyguard GONE state.\n\nTest: with keyguard_wm_state_refactor flag enabled, tap a notification\nwith an intent when the keyguard isn\u0027t showing (ie: shade over the\nlauncher). Observe that StatusBarKeyguardViewManager#show never gets\ncalled (requires manually logging since something else, when flexiglass\nisn\u0027t enabled, gates the keyguard from actually showing).\nTest: atest KeyguardSurfaceBehindInteractorTest\nBug: 308819693\nFlag: ACONFIG com.android.systemui.keyguard_wm_state_refactor DEVELOPMENT\n\nChange-Id: I5e103f5c3235dee06522828e56acaa73d86b9b29\n" }, { "commit": "df3ce9de47b0217311d0ae417c9d777633416b73", "tree": "f519f20d8ebf0c6a7282ec88d2152e7b119f2f35", "parents": [ "6e44c398a3c4b84cc582f910fe85dab49a96daf1", "44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 13:00:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 13:00:41 2024 +0000" }, "message": "Merge \"Add metaData null check in isRequiredAppDeclaredInMetadata\" into main am: 23311d456a am: 44115cf7c3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3040373\n\nChange-Id: Iab48f70c9927c9c779d261262ef6edb4aada0c1a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e44c398a3c4b84cc582f910fe85dab49a96daf1", "tree": "eaaa72d0ee94e2ea437211fc1ba9ede8637b9077", "parents": [ "9939ffb21a02a53b343bd61fffb412f512ce56f9", "dab290ec08d717cc501d8908ca47c6740bd6785c" ], "author": { "name": "Massimo Carli", "email": "mcarli@google.com", "time": "Mon Apr 15 12:36:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 12:36:18 2024 +0000" }, "message": "Merge \"Better help message for letterbox rounded corners\" into 24D1-dev am: dab290ec08\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26939878\n\nChange-Id: I9eb8217bfcfbc34cd950b43a972ca65d19f63719\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "44115cf7c3ac6a4cb8a6658b4d07055ffe16f9e1", "tree": "71db598c4c21615b597d6188c364296b5cf2303d", "parents": [ "a185585973b7ca7be0867b129e051f71367a5f16", "23311d456a77417fa9607029b369f6ce73a376b4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 12:27:56 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 12:27:56 2024 +0000" }, "message": "Merge \"Add metaData null check in isRequiredAppDeclaredInMetadata\" into main am: 23311d456a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3040373\n\nChange-Id: Ief352215470f40e386a67db61d4f271a9b9fd3a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dab290ec08d717cc501d8908ca47c6740bd6785c", "tree": "726caba9907b5b643b6468bd629d720a97c4a7e3", "parents": [ "5cf7320199729603083eb436c6a7cf9cc4b26bfa", "cba21134105b1544fc3f3ba41b03d6852431143e" ], "author": { "name": "Massimo Carli", "email": "mcarli@google.com", "time": "Mon Apr 15 12:25:50 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 12:25:50 2024 +0000" }, "message": "Merge \"Better help message for letterbox rounded corners\" into 24D1-dev" }, { "commit": "9939ffb21a02a53b343bd61fffb412f512ce56f9", "tree": "436e4e918e8f9eeec32a3021ec9a72ade5cf4e46", "parents": [ "88da519f2967660893d44d26c42c965b5542f9ef", "8a1a925fc62e1f0c94b717da83861066b4302d7c" ], "author": { "name": "Yiyi Shen", "email": "yiyishen@google.com", "time": "Mon Apr 15 12:13:19 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 12:13:19 2024 +0000" }, "message": "Merge \"Add getDevicesMatchingConnectionStates to local assistant profile\" into main" }, { "commit": "23311d456a77417fa9607029b369f6ce73a376b4", "tree": "71db598c4c21615b597d6188c364296b5cf2303d", "parents": [ "0affadc4ca82a569a91c686b1ad38ea8c24a0e5c", "c21afc29c3a0ea6fe95c24a390f352bbe6bf6b30" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 15 12:06:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 15 12:06:31 2024 +0000" }, "message": "Merge \"Add metaData null check in isRequiredAppDeclaredInMetadata\" into main" }, { "commit": "88da519f2967660893d44d26c42c965b5542f9ef", "tree": "21c5c7d265528d7683ee5f59af8df2dd3a167d74", "parents": [ "6c9627e6b8a82665b6824a10f823e81cea589b12", "a185585973b7ca7be0867b129e051f71367a5f16" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Mon Apr 15 12:03:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 12:03:26 2024 +0000" }, "message": "Merge \"fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START\" into main am: 0affadc4ca am: a185585973\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039724\n\nChange-Id: Ic6b4fb7598ef4e46a7df152d3b7d8f1964cd09a1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a185585973b7ca7be0867b129e051f71367a5f16", "tree": "1e6e6daba0a95a60e746fba356958e598cf808d3", "parents": [ "64523fec4bf1fa728abf91a7b5d296d7fb9e2aa9", "0affadc4ca82a569a91c686b1ad38ea8c24a0e5c" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Mon Apr 15 11:43:17 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 15 11:43:17 2024 +0000" }, "message": "Merge \"fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START\" into main am: 0affadc4ca\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3039724\n\nChange-Id: I6e1235dba1561f63af649049545788778fecafe1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c9627e6b8a82665b6824a10f823e81cea589b12", "tree": "495610f07541f9535d92067fa82acf9bac64b694", "parents": [ "bdf3e457b4b50a5a168dc0c822b60a4aae34c687", "f8f9e9ab11e65322aaaeb7373efd77cf1d671928" ], "author": { "name": "Ziad Youssef", "email": "ziadyoussef@google.com", "time": "Mon Apr 15 11:32:56 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 11:32:56 2024 +0000" }, "message": "Merge \"Better error handling for webkit classes\" into main" }, { "commit": "0affadc4ca82a569a91c686b1ad38ea8c24a0e5c", "tree": "1e6e6daba0a95a60e746fba356958e598cf808d3", "parents": [ "52bd4f135acdb36fbc7f3a4402bb29416e3ba06c", "dc44cbbb42583b67b876e6edd3f1231eba92ab5b" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Mon Apr 15 11:16:31 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 15 11:16:31 2024 +0000" }, "message": "Merge \"fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START\" into main" }, { "commit": "bdf3e457b4b50a5a168dc0c822b60a4aae34c687", "tree": "870a221f692f40f1e76c955d622a6718d291b7ba", "parents": [ "274c515f03e7c8e505ffef359508581b905d7c28", "8238efa9860bb5a922f309f02b1c7604921c0ca9" ], "author": { "name": "Eghosa Ewansiha-Vlachavas", "email": "eevlachavas@google.com", "time": "Mon Apr 15 10:48:33 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 10:48:33 2024 +0000" }, "message": "Merge \"Move all desktop mode intial bounds logic to `DesktopTasksController`\" into main" }, { "commit": "c21afc29c3a0ea6fe95c24a390f352bbe6bf6b30", "tree": "a2dab117f7cb5e2620313d664ef89416c3f5fb10", "parents": [ "52bd4f135acdb36fbc7f3a4402bb29416e3ba06c" ], "author": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Fri Apr 12 15:53:53 2024 +0900" }, "committer": { "name": "Jeongik Cha", "email": "jeongik@google.com", "time": "Mon Apr 15 19:45:13 2024 +0900" }, "message": "Add metaData null check in isRequiredAppDeclaredInMetadata\n\nIt could be null if there is no metadata in AndroidManifest.xml\n\nBug: 333859398\nTest: CtsAdminPackageInstallerTestCases\nChange-Id: Ic3f6a17fab917d10bce57b59b709a1d388959148\n" }, { "commit": "274c515f03e7c8e505ffef359508581b905d7c28", "tree": "4f15e7d670efc6d7da0dc2f59cdef66f35e02889", "parents": [ "dd15c42d7ac3a17d803e7b72b2289f87512ef719", "e3c06c2b7f22aec3595d997d9693128ecdad2e4f" ], "author": { "name": "Michael Mikhail", "email": "michaelmikhil@google.com", "time": "Mon Apr 15 10:37:10 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 10:37:10 2024 +0000" }, "message": "Merge \"Sort media when loaded or removed\" into main" }, { "commit": "8a1a925fc62e1f0c94b717da83861066b4302d7c", "tree": "d3785d44b85f1157dd64ef4074d4afc08b23db17", "parents": [ "5492bfb1d3a1ef859583e3f9493264ce7a709735" ], "author": { "name": "Yiyi Shen", "email": "yiyishen@google.com", "time": "Mon Apr 15 18:32:03 2024 +0800" }, "committer": { "name": "Yiyi Shen", "email": "yiyishen@google.com", "time": "Mon Apr 15 18:35:36 2024 +0800" }, "message": "Add getDevicesMatchingConnectionStates to local assistant profile\n\nTest: atest\nBug: 305620450\nChange-Id: I78c8e795becbd93eed43afee835dde5dc7d90bde\n" }, { "commit": "dd15c42d7ac3a17d803e7b72b2289f87512ef719", "tree": "1fcb23124bef74bf58ce43015dc36477f8989198", "parents": [ "020580d714d1afa8acd209fd6651eb59069ca39d", "b8028fae824b894e04a2a8bb56e08726497a684e" ], "author": { "name": "Riddle Hsu", "email": "riddlehsu@google.com", "time": "Mon Apr 15 10:18:45 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 10:18:45 2024 +0000" }, "message": "Merge \"Optimize attaching process for starting activity\" into main" }, { "commit": "dc44cbbb42583b67b876e6edd3f1231eba92ab5b", "tree": "1e6e6daba0a95a60e746fba356958e598cf808d3", "parents": [ "52bd4f135acdb36fbc7f3a4402bb29416e3ba06c" ], "author": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Mon Apr 15 08:37:20 2024 +0000" }, "committer": { "name": "Lalit Maganti", "email": "lalitm@google.com", "time": "Mon Apr 15 09:58:23 2024 +0000" }, "message": "fw: delay TracingServiceProxy until PHASE_THIRD_PARTY_APPS_CAN_START\n\nBecause all methods in TracingServiceProxy want to bind/start services\nin places outside system_server, it makes sense to wait until\nPHASE_THIRD_PARTY_APPS_CAN_START to actually publish the service\n\nThis should solve some subtle race conditions around OOM heap dumps where they were being dropped on the floor by system_server because the GMSCore package had not yet been populated by PackageManager.\n\nBug: 333846370\nChange-Id: I1addeafd9eac69e11c896fdda9a7a3924c09e22c\n" }, { "commit": "020580d714d1afa8acd209fd6651eb59069ca39d", "tree": "958c9234ab48a3dc1c78b285d10a2fa80c66f96d", "parents": [ "a375d1cc4ce3039015a0b829670518eaebb84c1b", "8f06138941fb3779c818465771489933babbe156" ], "author": { "name": "Anton Potapov", "email": "apotapov@google.com", "time": "Mon Apr 15 09:28:49 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 09:28:49 2024 +0000" }, "message": "Merge \"Make SystemUIBottomSheetDialog use DialogDelegate\" into main" }, { "commit": "a375d1cc4ce3039015a0b829670518eaebb84c1b", "tree": "c278f3eb6beb93c282c4d0f15cc13ea7aecc8b0e", "parents": [ "b021f78ab6b9137c8b6bb8bc012de88f909f95c1", "e395d1579e9571c7cce46772274cc59fc1dd4234" ], "author": { "name": "Luca Zuccarini", "email": "acul@google.com", "time": "Mon Apr 15 09:26:39 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Apr 15 09:26:39 2024 +0000" }, "message": "Merge \"Introduce and update interfaces for return animations and takeovers.\" into main" } ], "next": "8238efa9860bb5a922f309f02b1c7604921c0ca9" }