)]}' { "log": [ { "commit": "337cd41d3f5897a4ab21ee5551d62acdbe5e0f95", "tree": "c738154d6d19f5ed14923f0efb91a89d93feac46", "parents": [ "2324f3a7a1f1e0d95828283b27bc07c1f287478f", "0a5315c6fd96298a3fafdb9c453680f3c94826e9" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Sat May 06 00:11:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat May 06 00:11:29 2023 +0000" }, "message": "[automerger skipped] Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into rvc-dev am: 2a509c82ba am: 1678956190 -s ours am: 0a5315c6fd -s ours\n\nam skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665\n\nChange-Id: Ia247caf2008c5059a4e1d2c1d722cf3e0bfd24f4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0a5315c6fd96298a3fafdb9c453680f3c94826e9", "tree": "eba6d10ce9807584333de0f1d6da6dd9d410d971", "parents": [ "92577efba35ab84b3da8ead62a2d16e69ddb3b5d", "167895619021e79d95ac6400e473a64653c94876" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Fri May 05 23:30:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 05 23:30:44 2023 +0000" }, "message": "[automerger skipped] Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into rvc-dev am: 2a509c82ba am: 1678956190 -s ours\n\nam skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665\n\nChange-Id: I0dc94cac6b2a6e6011330ce94fd2ae506a3f7745\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "167895619021e79d95ac6400e473a64653c94876", "tree": "35dd1df93cf621a92eda03a9a3dbdb4afa6e92d9", "parents": [ "c8e95960f4c534219ae8808fa829ae125024a3cb", "2a509c82ba9282ca70209d759da521996b33af36" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Fri May 05 22:44:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 05 22:44:43 2023 +0000" }, "message": "Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into rvc-dev am: 2a509c82ba\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22911665\n\nChange-Id: I570f3ea30dd4eca2b913f63ffdbc7ca68564b908\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2a509c82ba9282ca70209d759da521996b33af36", "tree": "2f76a385d801e7c086567d3c875f4c0978a55ae2", "parents": [ "ab15dd4748b490000da26dfe4510dbe99b72acae", "821f4c0d8ba06be32ce9b46c7a7c09d1cacd7b0e" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Fri May 05 22:16:43 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri May 05 22:16:43 2023 +0000" }, "message": "Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into rvc-dev" }, { "commit": "2324f3a7a1f1e0d95828283b27bc07c1f287478f", "tree": "c738154d6d19f5ed14923f0efb91a89d93feac46", "parents": [ "214ad884c6240ed7d2147fb2471f09866aeaa977", "92577efba35ab84b3da8ead62a2d16e69ddb3b5d" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Fri May 05 00:00:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri May 05 00:00:12 2023 +0000" }, "message": "[automerger skipped] Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into sc-dev am: 92577efba3 -s ours\n\nam skip reason: Merged-In I0335496d28fa5fc3bfe1fecd4be90040b0b3687f with SHA-1 e37820e47c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959\n\nChange-Id: Icc7d8d1f992ff95e1b9476906f06254a45602801\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "92577efba35ab84b3da8ead62a2d16e69ddb3b5d", "tree": "eba6d10ce9807584333de0f1d6da6dd9d410d971", "parents": [ "5498223ce48f6265e60deec14d17483841a25759", "e37820e47c383aecf9d1173a0676c27e6a59ce4f" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Thu May 04 23:11:16 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 23:11:16 2023 +0000" }, "message": "Merge \"ActivityManagerService: Allow openContentUri from vendor/system/product.\" into sc-dev" }, { "commit": "214ad884c6240ed7d2147fb2471f09866aeaa977", "tree": "c738154d6d19f5ed14923f0efb91a89d93feac46", "parents": [ "d0a58c8ae6ae2a99452bf8d33da484e4d141843f", "78747bee101abb6ad72df51e6cd627d89a9d7b89" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Thu May 04 23:11:16 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 23:11:16 2023 +0000" }, "message": "Merge changes from topic \"presubmit-am-cb3c43babe4c45069e5619a744950e15\" into sc-qpr1-dev\n\n* changes:\n [automerge] ActivityManagerService: Allow openContentUri from vendor/system/product. 2p: e37820e47c\n ActivityManagerService: Allow openContentUri from vendor/system/product.\n" }, { "commit": "d0a58c8ae6ae2a99452bf8d33da484e4d141843f", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "1c9b60abebc0d8032b35b2844d6b4be22ab6effc", "5498223ce48f6265e60deec14d17483841a25759" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:06:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:06:43 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours am: 5498223ce4 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: Ic11291208e1dd0471a729fb4c940efce897b05ee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1c9b60abebc0d8032b35b2844d6b4be22ab6effc", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "9b24e381e39923e7a671972e95b4baa1295cbb2f", "657eef512a85353bffcb11aa09c15edbd23a870e" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:06:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:06:39 2023 +0000" }, "message": "[automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours am: 657eef512a -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: I1cf89e7f81879294d21b576fa1e6fc6e6f243dab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9b24e381e39923e7a671972e95b4baa1295cbb2f", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "e0d70331ee6c40f91901290703907da4a6a65d7d", "123c16e158690470cd1c28c5f3eaf660d4642d22" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:06:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:06:22 2023 +0000" }, "message": "[automerger skipped] Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-dev am: 08a8ba51f0 -s ours am: 9a0e0e03e1 -s ours am: 123c16e158 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: I9cca13ded75c9b9d47cef2d06bd0ac900f6b5496\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e0d70331ee6c40f91901290703907da4a6a65d7d", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "3338659fc16b2fb62235a1dda3812f61fee569a9", "e0c773a04a661b3d5f3ab7b09a544ade25710b69" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:06:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:06:18 2023 +0000" }, "message": "[automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours am: 50682f1b14 -s ours am: e0c773a04a -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: Ifd3618a276cbda93dcff7846554f67e99feebb26\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3338659fc16b2fb62235a1dda3812f61fee569a9", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "a06222a32994f4749c618205e1c279fb85f8fd51", "2cbc9dcf80aa441452f2fe9fac1af5928fffa98e" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:06:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:06:00 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464\n\nChange-Id: If0d624a115173f99d414ce2826541b1243b4920c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a06222a32994f4749c618205e1c279fb85f8fd51", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "d6a74ea7bbaa8be59d32b9b96352e420a65f42c7", "947889f9d18f970f4af297dd678440e38b6a587c" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:05:57 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:05:57 2023 +0000" }, "message": "[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464\n\nChange-Id: I19d0de5c5b85e6c137896333f700804b7adfbb8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6a74ea7bbaa8be59d32b9b96352e420a65f42c7", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "894d89724f4701273e57ac85bc4fda325b92e9ec", "a35e57533dba55b0663f39a674b6daa46bd0d1a6" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:05:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:05:44 2023 +0000" }, "message": "[automerger skipped] Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-qpr-dev am: ae08612d34 -s ours am: a35e57533d -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908562\n\nChange-Id: Ib0abb1d53782ddbcdaf76241b1fe5b62085a53bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "894d89724f4701273e57ac85bc4fda325b92e9ec", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "71e2d68ec86bbe34ba9135ad12e2dbd00ab03023", "854e2670530b9fcc02374b3acaf87d512ed6bf93" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:05:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:05:41 2023 +0000" }, "message": "[automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: a8078ff43d -s ours am: 854e267053 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908562\n\nChange-Id: Iea554b6e4b11abd05e207af4924792bf2d319831\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "71e2d68ec86bbe34ba9135ad12e2dbd00ab03023", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "1e95dd69213574f28f14328205b4c0a0a2604fc6", "b8b306b28f07630ebb7a4039c94367dda9160884" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:05:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:05:23 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into sc-dev am: b8b306b28f -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905557\n\nChange-Id: Id358cd08990f7a417c91a3cb4749291f693791f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5498223ce48f6265e60deec14d17483841a25759", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "657eef512a85353bffcb11aa09c15edbd23a870e", "c8e95960f4c534219ae8808fa829ae125024a3cb" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:04:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:04:08 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into rvc-dev am: ab15dd4748 -s ours am: c8e95960f4 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: I451ba9b5bc6b8049d62b95524a3570d75aeab83f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "657eef512a85353bffcb11aa09c15edbd23a870e", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "123c16e158690470cd1c28c5f3eaf660d4642d22", "d0b98bc6992c349415eed3766278f5c792861394" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:03:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:03:56 2023 +0000" }, "message": "[automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours am: d0b98bc699 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: I104768f6379745477fc4d84f090f58d411c7df40\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "123c16e158690470cd1c28c5f3eaf660d4642d22", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "e0c773a04a661b3d5f3ab7b09a544ade25710b69", "9a0e0e03e16d54fbc481d62f3bbb86101ac32da1" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:03:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:03:38 2023 +0000" }, "message": "[automerger skipped] Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-dev am: 08a8ba51f0 -s ours am: 9a0e0e03e1 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: I2b21939ace30f8422f9de8bb6ed7b1fb9901e25f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e0c773a04a661b3d5f3ab7b09a544ade25710b69", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "2cbc9dcf80aa441452f2fe9fac1af5928fffa98e", "50682f1b14a644f37a1cc799d18343b05ecb81c9" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:03:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:03:27 2023 +0000" }, "message": "[automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours am: 50682f1b14 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: If71c31bca4499ffa41bda64fbdd35eb4d6edf395\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2cbc9dcf80aa441452f2fe9fac1af5928fffa98e", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "947889f9d18f970f4af297dd678440e38b6a587c", "ed402182f22530c88ccc505563107f6fa922a27e" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:02:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:02:51 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into rvc-qpr-dev am: ed402182f2 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464\n\nChange-Id: I34998f1a5df29131205aa90a543b185f24c19f2f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "947889f9d18f970f4af297dd678440e38b6a587c", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "a35e57533dba55b0663f39a674b6daa46bd0d1a6", "6a278c3998e5805198092e8a9db028749a86c432" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:02:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:02:31 2023 +0000" }, "message": "[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464\n\nChange-Id: I6228f9f810928649e1420da80a60fe14cf6cb63f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a35e57533dba55b0663f39a674b6daa46bd0d1a6", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "854e2670530b9fcc02374b3acaf87d512ed6bf93", "ae08612d3497bd77e17968ccd3a2fde98d72a487" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:01:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:01:39 2023 +0000" }, "message": "[automerger skipped] Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-qpr-dev am: ae08612d34 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908562\n\nChange-Id: Ie116cd515ea8f575bf5eedc97ec7c8c85ce03214\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e95dd69213574f28f14328205b4c0a0a2604fc6", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "b4338bd1410593f12c672477c220378ec33e4c81", "5d5a3fea896ff954e16eb8cc615bcaa65446895e" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:01:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:01:27 2023 +0000" }, "message": "Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into sc-dev am: 5d5a3fea89\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457\n\nChange-Id: I3a2fa395d80b7a92e044369e8ec71b1e8cd3ad4d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "854e2670530b9fcc02374b3acaf87d512ed6bf93", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "b8b306b28f07630ebb7a4039c94367dda9160884", "a8078ff43d4506b1d941ef636fb866dfefa9824d" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 14:01:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:01:17 2023 +0000" }, "message": "[automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: a8078ff43d -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 43b1711332 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908562\n\nChange-Id: Ic997f0732f30e25d7018ccb383562538cc683ff4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c8e95960f4c534219ae8808fa829ae125024a3cb", "tree": "47e7d7861b4e9898ff15c3c596f730ba500ec51a", "parents": [ "d0b98bc6992c349415eed3766278f5c792861394", "ab15dd4748b490000da26dfe4510dbe99b72acae" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:00:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:00:56 2023 +0000" }, "message": "[automerger skipped] Merge \"Truncate ShortcutInfo Id\" into rvc-dev am: ab15dd4748 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: Ief66c7670c66631b803677c9597ee2790a985fe5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0b98bc6992c349415eed3766278f5c792861394", "tree": "47e7d7861b4e9898ff15c3c596f730ba500ec51a", "parents": [ "9a0e0e03e16d54fbc481d62f3bbb86101ac32da1", "f31df6234091b5b1de258a01dd4b2d8e5415ee2e" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 14:00:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 14:00:43 2023 +0000" }, "message": "[automerger skipped] Truncate ShortcutInfo Id am: f31df62340 -s ours\n\nam skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c3998 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22926536\n\nChange-Id: I4021e366bb0f12ba28b8dd1d9ae13c6d71976bad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a0e0e03e16d54fbc481d62f3bbb86101ac32da1", "tree": "47e7d7861b4e9898ff15c3c596f730ba500ec51a", "parents": [ "50682f1b14a644f37a1cc799d18343b05ecb81c9", "08a8ba51f07bffaf942f0d21cbecff9252d2fc48" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:59:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 13:59:32 2023 +0000" }, "message": "[automerger skipped] Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-dev am: 08a8ba51f0 -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: I5087ba8d9eeb452aa88f41ad0f1a17e045481038\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50682f1b14a644f37a1cc799d18343b05ecb81c9", "tree": "47e7d7861b4e9898ff15c3c596f730ba500ec51a", "parents": [ "ed402182f22530c88ccc505563107f6fa922a27e", "63f8ce3efd9a564ae83f1de38791a6d67c5a8ddb" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:59:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 13:59:09 2023 +0000" }, "message": "[automerger skipped] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. am: 63f8ce3efd -s ours\n\nam skip reason: Merged-In I848545f7aee202495c515f47a32871a2cb6ae707 with SHA-1 a8078ff43d is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22908601\n\nChange-Id: I0f11e8a673ca61d3bbc7e816769268980364541b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ed402182f22530c88ccc505563107f6fa922a27e", "tree": "47e7d7861b4e9898ff15c3c596f730ba500ec51a", "parents": [ "ae08612d3497bd77e17968ccd3a2fde98d72a487", "6a278c3998e5805198092e8a9db028749a86c432" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 13:49:20 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:49:20 2023 +0000" }, "message": "Merge \"Truncate ShortcutInfo Id\" into rvc-qpr-dev" }, { "commit": "ab15dd4748b490000da26dfe4510dbe99b72acae", "tree": "89ddca0c4a948de5eddd600ab3e028150008f4f5", "parents": [ "08a8ba51f07bffaf942f0d21cbecff9252d2fc48", "f31df6234091b5b1de258a01dd4b2d8e5415ee2e" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 13:47:04 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:47:04 2023 +0000" }, "message": "Merge \"Truncate ShortcutInfo Id\" into rvc-dev" }, { "commit": "b4338bd1410593f12c672477c220378ec33e4c81", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "92145ceb6ee56ed3cd9631198b4a9f44b6e341a9", "d35e2ef67c1b27c0c5f9fdbc525b15af8cc20f52" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 13:46:13 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:46:13 2023 +0000" }, "message": "Merge \"Truncate ShortcutInfo Id\" into sc-qpr1-dev" }, { "commit": "b8b306b28f07630ebb7a4039c94367dda9160884", "tree": "6d3f04985349d930487713f203be8673793155b0", "parents": [ "5d5a3fea896ff954e16eb8cc615bcaa65446895e", "ab0c8ac5b47509a71f27c4e5e9ce104d51bab0a8" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 13:45:35 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:45:35 2023 +0000" }, "message": "Merge \"Truncate ShortcutInfo Id\" into sc-dev" }, { "commit": "92145ceb6ee56ed3cd9631198b4a9f44b6e341a9", "tree": "b73303db6c9a16fcffe0bdc8c1328ae367bf2123", "parents": [ "59aee8fbbb34306f87283c60d27244a1695050c1", "4bc48527c06beddf0ca3632cab87e56741a3ac36" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Thu May 04 13:45:34 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:45:34 2023 +0000" }, "message": "Merge changes from topic \"presubmit-am-b1e9c1f0750d47e9be992038522e27c5\" into sc-qpr1-dev\n\n* changes:\n [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4\n Truncate ShortcutInfo Id\n" }, { "commit": "ae08612d3497bd77e17968ccd3a2fde98d72a487", "tree": "9869145160d13917161152ac31dd3f23f49fc41c", "parents": [ "022550d586eb0d7f4c0fc19ecf30f25a580e04ff", "a8078ff43d4506b1d941ef636fb866dfefa9824d" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:20:08 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:20:08 2023 +0000" }, "message": "Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-qpr-dev" }, { "commit": "08a8ba51f07bffaf942f0d21cbecff9252d2fc48", "tree": "8ca90301ba9aaa0879d1edfa947a641626ab46ea", "parents": [ "5664378a7cac48184ec0702a41aaed0677d41136", "63f8ce3efd9a564ae83f1de38791a6d67c5a8ddb" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:19:04 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:19:04 2023 +0000" }, "message": "Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into rvc-dev" }, { "commit": "5d5a3fea896ff954e16eb8cc615bcaa65446895e", "tree": "b8bb1b0046087dd973dfabf3bfb1e19a58f21ac4", "parents": [ "d7e53541470f08f240aa76aaaf07190aa548a543", "43b1711332763788c7abf05c3baa931296c45bbb" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:18:36 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:18:36 2023 +0000" }, "message": "Merge \"Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\" into sc-dev" }, { "commit": "59aee8fbbb34306f87283c60d27244a1695050c1", "tree": "8f3cec58615db96d3bfc810f9c85e3bb0c137f74", "parents": [ "206c83c4fe919acbb88489b997dcd9cb1238eeba", "0307b18a1af586d6ba531b8b5d7ff53dd59c5d6b" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 13:18:36 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu May 04 13:18:36 2023 +0000" }, "message": "Merge changes from topic \"presubmit-am-e981430fb42a480e9e40b7ef0b292a51\" into sc-qpr1-dev\n\n* changes:\n [automerge] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 2p: 43b1711332\n Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\n" }, { "commit": "206c83c4fe919acbb88489b997dcd9cb1238eeba", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "e1ca6ae90dc5cdc1098ed40833eb6fd08fa93318", "d7e53541470f08f240aa76aaaf07190aa548a543" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 10:52:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 10:52:12 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456\n\nChange-Id: I5915fc4eecf72f4ae998054bde70054dee6ec33b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e1ca6ae90dc5cdc1098ed40833eb6fd08fa93318", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "385e05a742c7a9f0deae49ec0ad677f04d4ee126", "55fbfb391d5b24f37d4866868750e49e3ab446ae" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 10:52:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 10:52:04 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416\n\nChange-Id: Ic4943692e00f020a99f8a519ae6dcb6a9aa7fafe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d7e53541470f08f240aa76aaaf07190aa548a543", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "55fbfb391d5b24f37d4866868750e49e3ab446ae", "022550d586eb0d7f4c0fc19ecf30f25a580e04ff" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 10:07:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 10:07:55 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456\n\nChange-Id: I886f16fafaf0f364a055af7ab4e77f6ffb7856b7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "55fbfb391d5b24f37d4866868750e49e3ab446ae", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842", "de7c43eb607fbc33677c4391586075861950747a" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 10:07:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 10:07:35 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931416\n\nChange-Id: I0abb4b303c00a83724feb57b27050b7980486ece\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "022550d586eb0d7f4c0fc19ecf30f25a580e04ff", "tree": "e63c8ab803f13355bd34df6bc9ce164454ab2e8a", "parents": [ "de7c43eb607fbc33677c4391586075861950747a", "5664378a7cac48184ec0702a41aaed0677d41136" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Thu May 04 10:05:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu May 04 10:05:29 2023 +0000" }, "message": "DO NOT MERGE Increase notification channel limit. am: 5664378a7c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22931456\n\nChange-Id: Ie583cdcfae673d0a3422525d213da797bae7f75b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4bc48527c06beddf0ca3632cab87e56741a3ac36", "tree": "a385d8541afd231eb78061931845350fd7f0b9b1", "parents": [ "385e05a742c7a9f0deae49ec0ad677f04d4ee126", "ab0c8ac5b47509a71f27c4e5e9ce104d51bab0a8" ], "author": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Wed May 03 13:02:57 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Wed May 03 13:02:57 2023 +0000" }, "message": "[automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905557\n\n\nChange-Id: I6ffe0034dbdd270d2d0fcca83641dd5311daa432\nMerged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\n" }, { "commit": "ab0c8ac5b47509a71f27c4e5e9ce104d51bab0a8", "tree": "6de9abd70e7536d85e48a83511351da0d0822653", "parents": [ "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Fri Apr 21 09:45:07 2023 +0000" }, "committer": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Wed May 03 13:02:38 2023 +0000" }, "message": "Truncate ShortcutInfo Id\n\nCreating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.\nThis put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.\n\nFixes: 273729476\nTest: atest ShortcutManagerTest2\nTest: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.\nChange-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\nMerged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\n" }, { "commit": "d35e2ef67c1b27c0c5f9fdbc525b15af8cc20f52", "tree": "a385d8541afd231eb78061931845350fd7f0b9b1", "parents": [ "385e05a742c7a9f0deae49ec0ad677f04d4ee126" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Fri Apr 21 09:45:07 2023 +0000" }, "committer": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Wed May 03 13:02:34 2023 +0000" }, "message": "Truncate ShortcutInfo Id\n\nCreating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.\nThis put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.\n\nFixes: 273729476\nTest: atest ShortcutManagerTest2\nTest: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.\nChange-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\nMerged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\n" }, { "commit": "f31df6234091b5b1de258a01dd4b2d8e5415ee2e", "tree": "bdc189447470311d88cc4ba3e69ec736674e4d79", "parents": [ "2b3817680a3895e357d181787ef5ef7d16de271d" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Fri Apr 21 09:45:07 2023 +0000" }, "committer": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Wed May 03 13:02:30 2023 +0000" }, "message": "Truncate ShortcutInfo Id\n\nCreating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.\nThis put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.\n\nFixes: 273729476\nTest: atest ShortcutManagerTest2\nTest: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.\nChange-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\nMerged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\n" }, { "commit": "6a278c3998e5805198092e8a9db028749a86c432", "tree": "3da436f187e47211ead8f71d5fb1dceb923bdeda", "parents": [ "cd993dd7e017adaea484142337c6de53c8cc963f" ], "author": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Fri Apr 21 09:45:07 2023 +0000" }, "committer": { "name": "András Kurucz", "email": "kurucz@google.com", "time": "Wed May 03 13:02:20 2023 +0000" }, "message": "Truncate ShortcutInfo Id\n\nCreating Conversation with a ShortcutId longer than 65_535 (max unsigned short), we did not save the conversation settings into the notification_policy.xml due to a restriction in FastDataOutput.\nThis put us to a state where the user changing the importance or turning off the notifications for the given conversation had no effect on notification behavior.\n\nFixes: 273729476\nTest: atest ShortcutManagerTest2\nTest: Create a test app which creates a Conversation with a long shortcutId. Go to the Conversation Settings and turn off Notifications. Post a new Notification to this Conversation and see if it is displayed.\nChange-Id: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\nMerged-In: I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5\n" }, { "commit": "0307b18a1af586d6ba531b8b5d7ff53dd59c5d6b", "tree": "8f3cec58615db96d3bfc810f9c85e3bb0c137f74", "parents": [ "385e05a742c7a9f0deae49ec0ad677f04d4ee126", "43b1711332763788c7abf05c3baa931296c45bbb" ], "author": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue May 02 17:06:49 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Tue May 02 17:06:49 2023 +0000" }, "message": "[automerge] Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS. 2p: 43b1711332\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22787457\n\nBug: 276729064\nChange-Id: I356f90456a3ef87b955593999fd8970a0e9126d9\n" }, { "commit": "a8078ff43d4506b1d941ef636fb866dfefa9824d", "tree": "589b740c7387c503365b0928efc39283ce1eb596", "parents": [ "cd993dd7e017adaea484142337c6de53c8cc963f" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Fri Apr 21 15:39:22 2023 +0000" }, "committer": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Tue May 02 17:01:52 2023 +0000" }, "message": "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\n\nAlso added the person URIs in the test, since they weren\u0027t being\nchecked.\n\nTest: atest NotificationManagerServiceTest \u0026 tested with POC from bug\nBug: 276729064\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d8602a0200ba92283463bd54cefcf97394bfa8)\nMerged-In: I848545f7aee202495c515f47a32871a2cb6ae707\nChange-Id: I848545f7aee202495c515f47a32871a2cb6ae707\n" }, { "commit": "63f8ce3efd9a564ae83f1de38791a6d67c5a8ddb", "tree": "9e0b2376f4d2f05d490d298d04a5e3cbc857eb63", "parents": [ "2b3817680a3895e357d181787ef5ef7d16de271d" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Fri Apr 21 15:39:22 2023 +0000" }, "committer": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Tue May 02 17:01:44 2023 +0000" }, "message": "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\n\nAlso added the person URIs in the test, since they weren\u0027t being\nchecked.\n\nTest: atest NotificationManagerServiceTest \u0026 tested with POC from bug\nBug: 276729064\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e0d8602a0200ba92283463bd54cefcf97394bfa8)\nMerged-In: I848545f7aee202495c515f47a32871a2cb6ae707\nChange-Id: I848545f7aee202495c515f47a32871a2cb6ae707\n" }, { "commit": "43b1711332763788c7abf05c3baa931296c45bbb", "tree": "b8bb1b0046087dd973dfabf3bfb1e19a58f21ac4", "parents": [ "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Fri Apr 21 15:39:22 2023 +0000" }, "committer": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Tue May 02 17:01:35 2023 +0000" }, "message": "Verify URI permissions for EXTRA_REMOTE_INPUT_HISTORY_ITEMS.\n\nAlso added the person URIs in the test, since they weren\u0027t being\nchecked.\n\nTest: atest NotificationManagerServiceTest \u0026 tested with POC from bug\nBug: 276729064\nChange-Id: I848545f7aee202495c515f47a32871a2cb6ae707\n" }, { "commit": "5664378a7cac48184ec0702a41aaed0677d41136", "tree": "68b4fbc7e0951cc23ec30a32cd061cac7827f1b1", "parents": [ "2b3817680a3895e357d181787ef5ef7d16de271d" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Fri Apr 28 14:11:04 2023 +0000" }, "committer": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Tue May 02 10:29:27 2023 +0000" }, "message": "DO NOT MERGE Increase notification channel limit.\n\nThis was previously reduced because it can cause an out of memory error or be abused to trigger a permanent denial of service, but it breaks some messages apps in Android 11, as they are creating too many channels. Rolling it back until the apps are fixed to reduce user impact.\n\nBug: 279447569\nBug: 261723753\nTest: N/A, this was previously 50k\nChange-Id: Id8da382f812d4abb8db723c40a61366a7402da4f\n" }, { "commit": "de7c43eb607fbc33677c4391586075861950747a", "tree": "e63c8ab803f13355bd34df6bc9ce164454ab2e8a", "parents": [ "cd993dd7e017adaea484142337c6de53c8cc963f" ], "author": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Fri Apr 28 14:11:04 2023 +0000" }, "committer": { "name": "Ioana Alexandru", "email": "aioana@google.com", "time": "Tue May 02 10:29:16 2023 +0000" }, "message": "DO NOT MERGE Increase notification channel limit.\n\nThis was previously reduced because it can cause an out of memory error or be abused to trigger a permanent denial of service, but it breaks some messages apps in Android 11, as they are creating too many channels. Rolling it back until the apps are fixed to reduce user impact.\n\nBug: 279447569\nBug: 261723753\nTest: N/A, this was previously 50k\nChange-Id: Id8da382f812d4abb8db723c40a61366a7402da4f\n" }, { "commit": "821f4c0d8ba06be32ce9b46c7a7c09d1cacd7b0e", "tree": "1166cd73f0920ce110398ce38c65d975948afe29", "parents": [ "2b3817680a3895e357d181787ef5ef7d16de271d" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Sat Mar 18 12:56:12 2023 -0700" }, "committer": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Mon May 01 19:51:01 2023 +0000" }, "message": "ActivityManagerService: Allow openContentUri from vendor/system/product.\n\nApps should not have direct access to this entry point. Check that the\ncaller is a vendor, system, or product package.\n\nTest: Ran PoC app and CtsMediaPlayerTestCases.\nBug: 236688380\nChange-Id: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f\nMerged-In: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f\n(cherry picked from commit d0ba7467c2cb2815f94f6651cbb1c2f405e8e9c7)\n" }, { "commit": "78747bee101abb6ad72df51e6cd627d89a9d7b89", "tree": "6b7966f815fa2e7e2364ed6abf743a132fb9b83f", "parents": [ "385e05a742c7a9f0deae49ec0ad677f04d4ee126", "e37820e47c383aecf9d1173a0676c27e6a59ce4f" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Mon May 01 19:48:12 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Mon May 01 19:48:12 2023 +0000" }, "message": "[automerge] ActivityManagerService: Allow openContentUri from vendor/system/product. 2p: e37820e47c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22915959\n\nBug: 236688380\nChange-Id: If52613c95390c46a724aafae3e6fd7cbaa2df1e1\nMerged-In: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f\n" }, { "commit": "e37820e47c383aecf9d1173a0676c27e6a59ce4f", "tree": "7d0bd78bd7bcffd4d05be8e6ec4bd3ddbe985c4c", "parents": [ "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842" ], "author": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Sat Mar 18 12:56:12 2023 -0700" }, "committer": { "name": "Austin Borger", "email": "borgera@google.com", "time": "Mon May 01 19:47:38 2023 +0000" }, "message": "ActivityManagerService: Allow openContentUri from vendor/system/product.\n\nApps should not have direct access to this entry point. Check that the\ncaller is a vendor, system, or product package.\n\nTest: Ran PoC app and CtsMediaPlayerTestCases.\nBug: 236688380\nChange-Id: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f\nMerged-In: I0335496d28fa5fc3bfe1fecd4be90040b0b3687f\n(cherry picked from commit d0ba7467c2cb2815f94f6651cbb1c2f405e8e9c7)\n" }, { "commit": "385e05a742c7a9f0deae49ec0ad677f04d4ee126", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "df080e09b4cfa1b8191ec9a733f3363702970aee", "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Apr 24 23:44:06 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 24 23:44:06 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0026fd4cb5 -s ours am: 9cbd0b8c2a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22786961\n\nChange-Id: I65ec313c51c705421cb2e3fabc6af195fa31819a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9cbd0b8c2ab01eb8cc4c5051241fe9d654841842", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "4d4d843d5aa1aea01494ec863f5de393188ce0c6", "0026fd4cb5c30204d65da94d675cddb8dd90297b" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Mon Apr 24 22:58:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 24 22:58:38 2023 +0000" }, "message": "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0026fd4cb5 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22786961\n\nChange-Id: Ib402cfea004578e016ca3511dc92c98f131766b9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0026fd4cb5c30204d65da94d675cddb8dd90297b", "tree": "8f2a30027ecb2f542827f6a35cb099936aba2200", "parents": [ "545042fbe6d31385ab58809ae275bd6b9f9c4c6c" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Apr 21 08:15:17 2023 -0700" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Fri Apr 21 08:15:17 2023 -0700" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\nChange-Id: I15ac500006851c0b0e4ce9a05fdf899b5bc7e9dd\n" }, { "commit": "df080e09b4cfa1b8191ec9a733f3363702970aee", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "f2f6a0e554c8565e0678f628bd70f21bf91b0647", "4d4d843d5aa1aea01494ec863f5de393188ce0c6" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 20:35:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 20:35:34 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and...\" into rvc-dev am: 2b3817680a am: cd993dd7e0 -s ours am: 4d4d843d5a -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: I328ebdff22b1ad908c5702ac444392ff9506a67e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2f6a0e554c8565e0678f628bd70f21bf91b0647", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "ab63a519affcaf237209962682e4daf603ef2a4e", "a42e85b0227a8f52e0200cef00bdbfbd547b207e" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 20:35:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 20:35:00 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and... am: 09f0047222 am: a4ff8bed4c -s ours am: a42e85b022 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: I7add734c674e54607d3bffcf84e40abfea9d2b90\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4d4d843d5aa1aea01494ec863f5de393188ce0c6", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "a42e85b0227a8f52e0200cef00bdbfbd547b207e", "cd993dd7e017adaea484142337c6de53c8cc963f" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 19:48:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 19:48:17 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and...\" into rvc-dev am: 2b3817680a am: cd993dd7e0 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: I1c3731d4eeaac99d76a9be8103b83f62c08f1deb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a42e85b0227a8f52e0200cef00bdbfbd547b207e", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "42c4052f45b3fd9fbac8fa948c9cd4045bc6849a", "a4ff8bed4cc697a1cb0db2163803e003824d0055" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 19:48:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 19:48:01 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and... am: 09f0047222 am: a4ff8bed4c -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: I141bc7811613d07a69ee4bbaf5827c4615a69d4a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ab63a519affcaf237209962682e4daf603ef2a4e", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "7fdc711cedbbf8198eeec05a17d77ad644580595", "42c4052f45b3fd9fbac8fa948c9cd4045bc6849a" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 18:20:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 18:20:45 2023 +0000" }, "message": "Merge \"Dismiss keyguard when simpin auth\u0027d and...\" into sc-dev am: 42c4052f45\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621774\n\nChange-Id: Ic95d4a81b63fba2d81225fdb2c1e7b4c34884e55\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd993dd7e017adaea484142337c6de53c8cc963f", "tree": "abc49640100387ea65502d66777217187a704fbd", "parents": [ "a4ff8bed4cc697a1cb0db2163803e003824d0055", "2b3817680a3895e357d181787ef5ef7d16de271d" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 18:18:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 18:18:45 2023 +0000" }, "message": "Merge \"DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and...\" into rvc-dev am: 2b3817680a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: I232f9ca2bb579dcca8c7d20284b6dcad4fc776fa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a4ff8bed4cc697a1cb0db2163803e003824d0055", "tree": "abc49640100387ea65502d66777217187a704fbd", "parents": [ "b4ce1ebb4a9421fba5ec331eb11296429e3dbe9d", "09f004722284ef6b9790ddf9338a1708b3f0833c" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 18:18:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 18:18:24 2023 +0000" }, "message": "DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and... am: 09f0047222\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621733\n\nChange-Id: Ib65c3b8759581e04f6bdfa3dfed49a467ef846e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2b3817680a3895e357d181787ef5ef7d16de271d", "tree": "7d0f078817eb74f1c00401d9b63c895c20c2b647", "parents": [ "7d8fd7a9e96d5c026cde5a88a8fa7554867a284f", "09f004722284ef6b9790ddf9338a1708b3f0833c" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 17:30:06 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 19 17:30:06 2023 +0000" }, "message": "Merge \"DO NOT MERGE Dismiss keyguard when simpin auth\u0027d and...\" into rvc-dev" }, { "commit": "42c4052f45b3fd9fbac8fa948c9cd4045bc6849a", "tree": "346b92d1fa1d6fa675e7c016b4750e8fe16575e3", "parents": [ "995bb7e3e6338e624ac7f0886236309f10f1e5a0", "65ea56f54c059584eb27ec53d486dba8161316ab" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 17:29:49 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 19 17:29:49 2023 +0000" }, "message": "Merge \"Dismiss keyguard when simpin auth\u0027d and...\" into sc-dev" }, { "commit": "7fdc711cedbbf8198eeec05a17d77ad644580595", "tree": "07cce7b8c56864e819e0cc87d8c9b91822f28210", "parents": [ "d0f9d226622a61f004d59f5deea310030a7e35ea", "929703119bae9550ad829113a3c186dbc66f0167" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Wed Apr 19 17:29:48 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 19 17:29:48 2023 +0000" }, "message": "Merge changes from topic \"cherrypicker-L22000000959901080:N28400001357657640\" into sc-qpr1-dev\n\n* changes:\n [automerge] Dismiss keyguard when simpin auth\u0027d and... 2p: 65ea56f54c\n Dismiss keyguard when simpin auth\u0027d and...\n" }, { "commit": "d0f9d226622a61f004d59f5deea310030a7e35ea", "tree": "c0d208d59245015f3a50f21a9f958d149ecf4d94", "parents": [ "a64d31ef63d1c2b680361eef44e89dbfd16bacc7", "995bb7e3e6338e624ac7f0886236309f10f1e5a0" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 11:41:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 11:41:43 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9 am: b4ce1ebb4a am: 995bb7e3e6\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525\n\nChange-Id: Ifb22957a3e0a63a895bfd800325ea238b7234164\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "995bb7e3e6338e624ac7f0886236309f10f1e5a0", "tree": "e94870a043e4767f9ca17c12eb110b42d0f9f7d6", "parents": [ "bee0f8e5769e9434a04d6f76ebc72e0346d9a411", "b4ce1ebb4a9421fba5ec331eb11296429e3dbe9d" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 10:34:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 10:34:32 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9 am: b4ce1ebb4a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525\n\nChange-Id: Ieb48d0ac0790584e1df573c4d899f8f355394c46\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b4ce1ebb4a9421fba5ec331eb11296429e3dbe9d", "tree": "87652a9303a83faad15b9929b2c8021526f222ac", "parents": [ "48994ad16f5bb24696b699711f3e9fec2fba232a", "7d8fd7a9e96d5c026cde5a88a8fa7554867a284f" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 09:45:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 09:45:03 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev am: a082fd92a4 am: a0237b2e83 am: 7d8fd7a9e9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525\n\nChange-Id: I43cb95c6c9e4878ef9e16b86f8c4b39de2a85ece\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7d8fd7a9e96d5c026cde5a88a8fa7554867a284f", "tree": "cc89e4863300d87f993c3a5586dccdd43259e6ee", "parents": [ "07272cfaee8d3fd2eaba285e531203e8c98c8bdf", "a0237b2e83cbeb4d4d70da99a5ee87faeb3d0f36" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 09:00:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 09:00:10 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev am: a082fd92a4 am: a0237b2e83\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525\n\nChange-Id: Ifef9764db9f05834e98d53e946028ce1b7a54463\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a0237b2e83cbeb4d4d70da99a5ee87faeb3d0f36", "tree": "7fce3dde15eebdb18eb957574f23e2e7be29ec45", "parents": [ "b59868db83a4ac5c4c9cec2c16239c4746f3a403", "a082fd92a4b91180078b2f98cb79728cdd5ff1f4" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 08:19:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 19 08:19:51 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev am: a082fd92a4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21327525\n\nChange-Id: I6815d23a9672f31048a650bb29de39880b698194\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a082fd92a4b91180078b2f98cb79728cdd5ff1f4", "tree": "9e62556b120918caebbea8b8927ee80d07e3d934", "parents": [ "ba8c9b4f2de29be14b5648fb1b437a747fcc445d", "c62d2e1021a030f4f0ae5fcfc8fe8e0875fa669f" ], "author": { "name": "Winson Chung", "email": "winsonc@google.com", "time": "Wed Apr 19 07:24:18 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 19 07:24:18 2023 +0000" }, "message": "Merge \"Only allow NEW_TASK flag when adjusting pending intents\" into qt-dev" }, { "commit": "a64d31ef63d1c2b680361eef44e89dbfd16bacc7", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "1688b4a580ca9d686e41421405ffdd9b6122668d", "bee0f8e5769e9434a04d6f76ebc72e0346d9a411" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 19:51:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 19:51:11 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-dev am: 07272cfaee am: 48994ad16f -s ours am: bee0f8e576 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: I2b58c1a7ae771ba555ac00b006f76a68a1482bfe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1688b4a580ca9d686e41421405ffdd9b6122668d", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "346ad5fada6f42d964afa1c149ceb98d4a7a2424", "66a5cc9a0e6a42c55bc90a7145ecafbb3fb560bc" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 19:51:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 19:51:02 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f am: 88bc01ef01 -s ours am: 66a5cc9a0e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: I4925125a755993541c50b3c9b78775dd44add294\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bee0f8e5769e9434a04d6f76ebc72e0346d9a411", "tree": "9d815785e51bff566e38f5d7149219fc39311203", "parents": [ "66a5cc9a0e6a42c55bc90a7145ecafbb3fb560bc", "48994ad16f5bb24696b699711f3e9fec2fba232a" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:46:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:46:37 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-dev am: 07272cfaee am: 48994ad16f -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: I0fe5e5406d9ce51fe4961f213d858a188a5d22ca\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "66a5cc9a0e6a42c55bc90a7145ecafbb3fb560bc", "tree": "9d815785e51bff566e38f5d7149219fc39311203", "parents": [ "d294e11427278418aa5a831b91919819a2760063", "88bc01ef01ee58828a35f079f95cb21533e2a4dc" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:45:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:45:51 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f am: 88bc01ef01 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: I26757fc95fcf32f786410bdd67f7abe582c2dd56\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "346ad5fada6f42d964afa1c149ceb98d4a7a2424", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "462c8eb5d845a2333fe101d0cfc08efa021e53ce", "d294e11427278418aa5a831b91919819a2760063" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:25:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:25:21 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-qpr-dev am: 4de0740bf8 -s ours am: d294e11427 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988\n\nChange-Id: I76c14721b804a72868bfed9472c530698dfc5e60\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "462c8eb5d845a2333fe101d0cfc08efa021e53ce", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "ddfac690e097ecff6b0a49e6375e4d437d11e466", "c9c86978eb294d3ef3983fd38b60007792a133a8" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:25:12 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:25:12 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef64 -s ours am: c9c86978eb -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988\n\nChange-Id: Id6d66746cc92aadda9d84738e56a03dbf2832db3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "48994ad16f5bb24696b699711f3e9fec2fba232a", "tree": "37e0811e92cfb7cce376576e5b5e0ac4ea4d3b7c", "parents": [ "88bc01ef01ee58828a35f079f95cb21533e2a4dc", "07272cfaee8d3fd2eaba285e531203e8c98c8bdf" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:04:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:04:14 2023 +0000" }, "message": "Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-dev am: 07272cfaee\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: I19ee0bfac5c35699d0138eb1d13c7195ac97ba06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "88bc01ef01ee58828a35f079f95cb21533e2a4dc", "tree": "37e0811e92cfb7cce376576e5b5e0ac4ea4d3b7c", "parents": [ "4de0740bf8217898830bc8d796649ee246350b82", "6b1746ab6f0ff4020c78381833554f20344c2e2a" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 18:03:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 18:03:34 2023 +0000" }, "message": "DO NOT MERGE: Limit the ServiceFriendlyNames am: 6b1746ab6f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599772\n\nChange-Id: Ie3aa7e164a8ea3342d7ce0a9f5e5f24af732acfd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d294e11427278418aa5a831b91919819a2760063", "tree": "9d815785e51bff566e38f5d7149219fc39311203", "parents": [ "c9c86978eb294d3ef3983fd38b60007792a133a8", "4de0740bf8217898830bc8d796649ee246350b82" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 17:47:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 17:47:24 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-qpr-dev am: 4de0740bf8 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988\n\nChange-Id: Ie12bd23a85c44e39b2ae06648c224725df9f6661\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9c86978eb294d3ef3983fd38b60007792a133a8", "tree": "9d815785e51bff566e38f5d7149219fc39311203", "parents": [ "65a0a7030a1b0057f8b74dcd8cde1c118af3688d", "de8f0fef6438a31fb2885bbbb3c6c218f64fc676" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 17:47:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 17:47:08 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Limit the ServiceFriendlyNames am: de8f0fef64 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22599988\n\nChange-Id: Ic177a4391e038f894a9eff8aac801470ec4d4a02\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "07272cfaee8d3fd2eaba285e531203e8c98c8bdf", "tree": "7a2ca2abe0f808eae4440ea0807b7b9c895e7d04", "parents": [ "23a890a43fb857d6c358d89a7ab7953ae0473cd0", "6b1746ab6f0ff4020c78381833554f20344c2e2a" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 17:23:33 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 18 17:23:33 2023 +0000" }, "message": "Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-dev" }, { "commit": "4de0740bf8217898830bc8d796649ee246350b82", "tree": "37e0811e92cfb7cce376576e5b5e0ac4ea4d3b7c", "parents": [ "472f9aa49eb3a71fa28d8c1cef190cf694066a8f", "de8f0fef6438a31fb2885bbbb3c6c218f64fc676" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Tue Apr 18 17:22:49 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 18 17:22:49 2023 +0000" }, "message": "Merge \"DO NOT MERGE: Limit the ServiceFriendlyNames\" into rvc-qpr-dev" }, { "commit": "ddfac690e097ecff6b0a49e6375e4d437d11e466", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "f1854137678275d9a94e325e82fac4b3175574ba", "65a0a7030a1b0057f8b74dcd8cde1c118af3688d" ], "author": { "name": "Matías Hernández", "email": "matiashe@google.com", "time": "Tue Apr 18 13:11:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 13:11:18 2023 +0000" }, "message": "Merge \"Grant URI permissions to the CallStyle-related ones\" into sc-dev am: 65a0a7030a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22616881\n\nChange-Id: Iccf8b019e00aaea71adbf988ee82f45e7a50cfa0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "65a0a7030a1b0057f8b74dcd8cde1c118af3688d", "tree": "9d815785e51bff566e38f5d7149219fc39311203", "parents": [ "aaeb1e0f3e111d0a8c9698b75abe0a2c41ff4000", "4dee5aab12e95cd8b4d663ad050f07b0f2433596" ], "author": { "name": "Matías Hernández", "email": "matiashe@google.com", "time": "Tue Apr 18 12:14:23 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 18 12:14:23 2023 +0000" }, "message": "Merge \"Grant URI permissions to the CallStyle-related ones\" into sc-dev" }, { "commit": "f1854137678275d9a94e325e82fac4b3175574ba", "tree": "3ae7739c641c0a7d5d0fb21c928ef1f52a04a652", "parents": [ "d2cab3ef8769d51b09fd8ab0a79e26c9f3adb2b8", "2186ce526a6c08b0565ede56a5c430a09cc5b8be" ], "author": { "name": "Matías Hernández", "email": "matiashe@google.com", "time": "Tue Apr 18 12:14:23 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 18 12:14:23 2023 +0000" }, "message": "Merge changes from topic \"presubmit-am-a62a1375dec9427ba5398fef38c87ad3\" into sc-qpr1-dev\n\n* changes:\n [automerge] Grant URI permissions to the CallStyle-related ones 2p: 4dee5aab12\n Grant URI permissions to the CallStyle-related ones\n" }, { "commit": "929703119bae9550ad829113a3c186dbc66f0167", "tree": "f63ebc5703ca5357b0be2374e66fe4d7e4c56fd7", "parents": [ "d2cab3ef8769d51b09fd8ab0a79e26c9f3adb2b8", "65ea56f54c059584eb27ec53d486dba8161316ab" ], "author": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Mon Apr 17 18:59:46 2023 +0000" }, "committer": { "name": "Presubmit Automerger Backend", "email": "android-build-presubmit-automerger-backend@system.gserviceaccount.com", "time": "Mon Apr 17 18:59:46 2023 +0000" }, "message": "[automerge] Dismiss keyguard when simpin auth\u0027d and... 2p: 65ea56f54c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621774\n\nBug: 222446076\nChange-Id: I4d20ae6ef3b38fea55f0f331ae50f5f786e458b6\nMerged-In: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4\n" }, { "commit": "65ea56f54c059584eb27ec53d486dba8161316ab", "tree": "69f7319549da18fc794dc3cbdbe9ab9873c10df5", "parents": [ "b1cc81c36514df527efdb25b6adc3cb471e7c77a" ], "author": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Tue Mar 28 13:15:04 2023 -0700" }, "committer": { "name": "Aaron Liu", "email": "aaronjli@google.com", "time": "Mon Apr 17 18:59:05 2023 +0000" }, "message": "Dismiss keyguard when simpin auth\u0027d and...\n\nsecurity method is none. This is mostly to fix the case where we auth\nsim pin in the set up wizard and it goes straight to keyguard instead of\nthe setup wizard activity.\n\nThis works with the prevent bypass keyguard flag because the device\nshould be noe secure in this case.\n\nFixes: 222446076\nTest: turn locked sim on, which opens the sim pin screen. Auth the\nscreen and observe that keyguard is not shown.\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6)\nMerged-In: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4\nChange-Id: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4\nCherry-picking this CL as a security fix\n\nBug: 222446076\nChange-Id: Id302c41f63028bc6dd58ba686e23d73565de9675\n" }, { "commit": "d2cab3ef8769d51b09fd8ab0a79e26c9f3adb2b8", "tree": "d16973dd107395a00f5ddd0718e9cc714087c613", "parents": [ "c8c0cee0654696834bd10672a1ed7f54dcef03fd", "aaeb1e0f3e111d0a8c9698b75abe0a2c41ff4000" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:40:32 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:40:32 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Add size check on PPS#policy\" into rvc-dev am: 23a890a43f am: 472f9aa49e -s ours am: aaeb1e0f3e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: Ic85bc44131a7a68eaa921c75c4a1c9683e5052ce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c8c0cee0654696834bd10672a1ed7f54dcef03fd", "tree": "d16973dd107395a00f5ddd0718e9cc714087c613", "parents": [ "24efdced2db9beca62a077b3f4b84aae1f1b1621", "fed303b664c63d9eec3ae89d14814c4fd8b901d8" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:40:29 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:40:29 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Add size check on PPS#policy am: d1afd2c47d am: a6809f47b7 -s ours am: fed303b664 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: Ifbc568dd4e5e31bef747530a086f4123ef270ff4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "24efdced2db9beca62a077b3f4b84aae1f1b1621", "tree": "d16973dd107395a00f5ddd0718e9cc714087c613", "parents": [ "d89471ec589ca1a2897c1b0603b5c7b5621e286d", "0bc0d8447d1788dc3fe3060cd89441aa9975799e" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:38:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:38:36 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Add size check on PPS#policy am: de5afd30ab -s ours am: 0bc0d8447d -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22634062\n\nChange-Id: I860e495a8d1717e4fbdd0dfa35e47dad6c5c77d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aaeb1e0f3e111d0a8c9698b75abe0a2c41ff4000", "tree": "08d4b55b6132dd38da8943747dcd3d5de7e62612", "parents": [ "fed303b664c63d9eec3ae89d14814c4fd8b901d8", "472f9aa49eb3a71fa28d8c1cef190cf694066a8f" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:24:13 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:24:13 2023 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE: Add size check on PPS#policy\" into rvc-dev am: 23a890a43f am: 472f9aa49e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: I61656c7a66d64b3ffb96e6fbf035cc56fe6a21c3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fed303b664c63d9eec3ae89d14814c4fd8b901d8", "tree": "08d4b55b6132dd38da8943747dcd3d5de7e62612", "parents": [ "0bc0d8447d1788dc3fe3060cd89441aa9975799e", "a6809f47b7e5165d91206d6d0bc7ebb52f5b3315" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:23:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:23:45 2023 +0000" }, "message": "[automerger skipped] DO NOT MERGE: Add size check on PPS#policy am: d1afd2c47d am: a6809f47b7 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: I1b2070acce1e4f10a5f72a061c2f8097c8bb6733\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "472f9aa49eb3a71fa28d8c1cef190cf694066a8f", "tree": "9add8b2095689b2d2f35d73bc423c8606432e135", "parents": [ "a6809f47b7e5165d91206d6d0bc7ebb52f5b3315", "23a890a43fb857d6c358d89a7ab7953ae0473cd0" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:09:28 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:09:28 2023 +0000" }, "message": "Merge \"DO NOT MERGE: Add size check on PPS#policy\" into rvc-dev am: 23a890a43f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: Ia09371195083387d7def181fca256f1e4c3b91f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6809f47b7e5165d91206d6d0bc7ebb52f5b3315", "tree": "9add8b2095689b2d2f35d73bc423c8606432e135", "parents": [ "de5afd30abb6148e30300f1ad5ac00ff2f391fa4", "d1afd2c47d086e0365bf6814a9f47555c294769f" ], "author": { "name": "Nate(Qiang) Jiang", "email": "qiangjiang@google.com", "time": "Fri Apr 14 20:08:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 20:08:53 2023 +0000" }, "message": "DO NOT MERGE: Add size check on PPS#policy am: d1afd2c47d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22633545\n\nChange-Id: I5b9287cccadb3c93a395b5a991c1f996f0557fe2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "0bc0d8447d1788dc3fe3060cd89441aa9975799e" }