)]}' { "log": [ { "commit": "0074dec1ef43d8a509e39feafda6c4a98bb09e83", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "903aee52d0f34f39315bd8c9a6846e577175a123", "8ad4939900727154b37ed64264d7aff927229215" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:43 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 20 13:39:43 2024 -0800" }, "message": "Empty merge ab/12770256 into aosp-main-future\n\nMerged-In: I02c31b847e1df54d2b616004ecb8612286cffd2e\nChange-Id: Id5c072fc809f61207a85213d9697304e89680bb9\n" }, { "commit": "903aee52d0f34f39315bd8c9a6846e577175a123", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "1e3c0d62f918aa893cab2fbdd3b95870ab0fc0d4", "99647588cb977f530cc15dcc550bfb93944645c8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 19:12:34 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 19:12:34 2024 -0800" }, "message": "[automerger skipped] Merge \"Merge 24Q4 into AOSP main\" into main am: 99647588cb -s ours\n\nam skip reason: Merged-In I1422d0f5b6e136d65e40c3731f60588defa96b94 with SHA-1 423f3f7007 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/3413937\n\nChange-Id: I71e3573130dcd438d83a87ef4f4146d083d03371\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1e3c0d62f918aa893cab2fbdd3b95870ab0fc0d4", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "b7118a4db9c0d95070000fbfb1ecfcf7505579c2", "73e9f027239cea215ae0cdbc9e41732dc0b449ff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 19:12:31 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 19:12:31 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 73e9f02723 -s ours\n\nam skip reason: Merged-In I1422d0f5b6e136d65e40c3731f60588defa96b94 with SHA-1 423f3f7007 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/3413937\n\nChange-Id: Ibb8d17345fc704d3418a1d5e56c47aba90c58431\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "99647588cb977f530cc15dcc550bfb93944645c8", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "92e8eaa7ff670e584a61efbc7cac81360d7e1a80", "73e9f027239cea215ae0cdbc9e41732dc0b449ff" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 16:56:55 2024 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 13 16:56:55 2024 -0800" }, "message": "Merge \"Merge 24Q4 into AOSP main\" into main" }, { "commit": "73e9f027239cea215ae0cdbc9e41732dc0b449ff", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "92e8eaa7ff670e584a61efbc7cac81360d7e1a80", "b7118a4db9c0d95070000fbfb1ecfcf7505579c2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:16 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:16 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I1422d0f5b6e136d65e40c3731f60588defa96b94\nChange-Id: Iaa3c05437ac9251522252d243ce09809dabef687\n" }, { "commit": "8ad4939900727154b37ed64264d7aff927229215", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "423f3f70077307a6822fa3ac29bb9594ffd7fda4", "b7118a4db9c0d95070000fbfb1ecfcf7505579c2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Nov 14 01:19:48 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 14 01:19:48 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: b7118a4db9 -s ours\n\nam skip reason: Merged-In I1422d0f5b6e136d65e40c3731f60588defa96b94 with SHA-1 423f3f7007 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/30284674\n\nChange-Id: I91f53e1726b6545a03adfeed6b1e67e10003f671\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b7118a4db9c0d95070000fbfb1ecfcf7505579c2", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "92e8eaa7ff670e584a61efbc7cac81360d7e1a80", "423f3f70077307a6822fa3ac29bb9594ffd7fda4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:26 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:26 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I1422d0f5b6e136d65e40c3731f60588defa96b94\nChange-Id: Ifbfcf42627301642fe34197e311cc016d4eeb093\n" }, { "commit": "423f3f70077307a6822fa3ac29bb9594ffd7fda4", "tree": "d67dd657311b8f2c09ab6398c830e92e90c4c106", "parents": [ "92e8eaa7ff670e584a61efbc7cac81360d7e1a80" ], "author": { "name": "rambowang", "email": "rambowang@google.com", "time": "Tue Jul 09 11:26:00 2024 -0500" }, "committer": { "name": "rambowang", "email": "rambowang@google.com", "time": "Tue Jul 09 11:26:00 2024 -0500" }, "message": "Check Phone process UID with multi-user-aware way\n\nThis CL calls UserHandle.isSameApp to make sure the UID check with\nProcess.SYSTEM_UID and PHONE_UID are multiple-user-aware.\n\nThe logic to directly compare UID with PROCESS.XXX_UID only works for\nsystem user. For secondary users, system/phone processes may run with\nUID prefixed with user id.\n\nUserHandle.isSameApp helps to correctly detect the system/phone process\nby comparing only the App id part.\n\nBug: 328511085\nTest: Treehugger\nFlag: com.android.internal.telephony.flags.support_phone_uid_check_for_multiuser\nChange-Id: I1422d0f5b6e136d65e40c3731f60588defa96b94\n" }, { "commit": "92e8eaa7ff670e584a61efbc7cac81360d7e1a80", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "ff6f679428a3a3a4e754a0ce6ed504579c12f298", "9195494fdfe1192a610952a0f8f831a9462b8cb4" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:26:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:26:48 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours am: d8f0918496 -s ours am: acaec52a90 -s ours am: 9195494fdf -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I58f51d534e68a3f76ae8ca68f16fb670bb9015a3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ff6f679428a3a3a4e754a0ce6ed504579c12f298", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "f7f91160988e4557c1b23b8fbc1508a8a14c59eb", "d0aa48c20ae72b3df0911f2a65e28b3d9fbe901f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:46 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours am: a1edc4c2ae -s ours am: 6090504b76 -s ours am: 735657eeb4 -s ours am: d0aa48c20a -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I07f97181afb787cc88172018937dd4e47f8042dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9195494fdfe1192a610952a0f8f831a9462b8cb4", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "d0aa48c20ae72b3df0911f2a65e28b3d9fbe901f", "acaec52a90c38a08d838f9e610c5b188935351dd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:07:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:07:16 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours am: d8f0918496 -s ours am: acaec52a90 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: Ic0c492e4459af402d965657d8d01233ee6d67541\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0aa48c20ae72b3df0911f2a65e28b3d9fbe901f", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "214f16a4b17e1f8565b926c25a6842cbb4e0cafe", "735657eeb405146d92e6f41bb4e211a979872b28" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:01:15 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:01:15 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours am: a1edc4c2ae -s ours am: 6090504b76 -s ours am: 735657eeb4 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I5a6f45c05f710c5a4fb8537533f0d1d79ad4abd9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "acaec52a90c38a08d838f9e610c5b188935351dd", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "735657eeb405146d92e6f41bb4e211a979872b28", "d8f0918496cdca916c086e10a65b7e1c62abc297" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:57:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:57:27 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours am: d8f0918496 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: Id4ac9147d747363fcbd78de603906bae89e984db\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "735657eeb405146d92e6f41bb4e211a979872b28", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "41fd8b680b2cf9e8381b884863694d64ad207ede", "6090504b76f97de2a68725d64672168988fbca14" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:25 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours am: a1edc4c2ae -s ours am: 6090504b76 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: Ic852a1166340b68ae5be6c67f06dd2fc4b08396f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d8f0918496cdca916c086e10a65b7e1c62abc297", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "6090504b76f97de2a68725d64672168988fbca14", "10139dc6d1e0d4d2d5ae536a358cfacb3a0e69f9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:05:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:05:44 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: bef4715368 -s ours am: 10139dc6d1 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I28ec4050cb66633e005911104d6df8f91ae210c6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6090504b76f97de2a68725d64672168988fbca14", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "5cbc159eff1bb176ef961ebe0abb7249a5c292a9", "a1edc4c2aeefca3af44ef661dd67632b01fcb8f0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:44 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours am: a1edc4c2ae -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I54acae9687c8a544751eb12ac5b3a950ad6c70a2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "10139dc6d1e0d4d2d5ae536a358cfacb3a0e69f9", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "a1edc4c2aeefca3af44ef661dd67632b01fcb8f0", "bef47153681f46df3f5712de0fd1db4885b3b021" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:58:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:58:49 2023 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 14\" into main am: bef4715368 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: I6c278a88ac4938a88b4f5ed2bd11a453f1f0c297\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a1edc4c2aeefca3af44ef661dd67632b01fcb8f0", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "82e90b4e78e26327db287b9827a1e2abb781c43f", "3a3d1aca75435247f485c317c4807f73e57059b6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:45 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 3a3d1aca75 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2776760\n\nChange-Id: Ic34f3642668f61ccde7ee5249706d5d7fc9d5b4d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bef47153681f46df3f5712de0fd1db4885b3b021", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "b61b148c40d67491b5a199c60f8543b61be2e9a2", "3a3d1aca75435247f485c317c4807f73e57059b6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 05:34:30 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 06 05:34:30 2023 +0000" }, "message": "Merge \"Merge Android 14\" into main" }, { "commit": "3a3d1aca75435247f485c317c4807f73e57059b6", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "b61b148c40d67491b5a199c60f8543b61be2e9a2", "82e90b4e78e26327db287b9827a1e2abb781c43f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:40:42 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:40:42 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f\nChange-Id: I302e18ca73f5cc5cde2010d461cc748491a63641\n" }, { "commit": "f7f91160988e4557c1b23b8fbc1508a8a14c59eb", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "5ba319ada968ba5491ff739ba9d0345c0638b962", "214f16a4b17e1f8565b926c25a6842cbb4e0cafe" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:38:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:38:40 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 82e90b4e78 -s ours am: 5cbc159eff -s ours am: 41fd8b680b -s ours am: 214f16a4b1 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/24182827\n\nChange-Id: I9f82637a41b9fabedf620cdbd3738586c2b4743c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "214f16a4b17e1f8565b926c25a6842cbb4e0cafe", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "cf2d6a8b9daaaf0f337a4422520003971ff1acf0", "41fd8b680b2cf9e8381b884863694d64ad207ede" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:11:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:11:34 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 82e90b4e78 -s ours am: 5cbc159eff -s ours am: 41fd8b680b -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/24182827\n\nChange-Id: I01b9c6d1ab49bd58c9ed4719d5444b93aef958cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41fd8b680b2cf9e8381b884863694d64ad207ede", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "cf2d6a8b9daaaf0f337a4422520003971ff1acf0", "5cbc159eff1bb176ef961ebe0abb7249a5c292a9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:35:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:35:50 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 82e90b4e78 -s ours am: 5cbc159eff -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/24182827\n\nChange-Id: Ic5c14f442df2775ca9c47f83561abce52e7bfadf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5cbc159eff1bb176ef961ebe0abb7249a5c292a9", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "572bfdb0380e304d023aedc42e3bb5fe4729c05f", "82e90b4e78e26327db287b9827a1e2abb781c43f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:59:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:59:51 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 82e90b4e78 -s ours\n\nam skip reason: Merged-In I02c9eb59eabf16a5b862ae78670d31db6e1fc15f with SHA-1 572bfdb038 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/24182827\n\nChange-Id: I939f8dff8c98fd38ba0e1da6b8c639de37a85046\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "82e90b4e78e26327db287b9827a1e2abb781c43f", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "b61b148c40d67491b5a199c60f8543b61be2e9a2", "572bfdb0380e304d023aedc42e3bb5fe4729c05f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:40:44 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:40:44 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f\nChange-Id: I99658fca1f094ca57dc843a5fccd7e28e39eaa06\n" }, { "commit": "5ba319ada968ba5491ff739ba9d0345c0638b962", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "92839cae3f002c76cd57a278aa0abecdd3c94330", "8aef2fc9866134399e39b2a4444e5070dbb3b6c5" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jun 06 18:40:27 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 06 18:40:27 2023 +0000" }, "message": "Merge \"Set logging for SipAudioCall to FALSE.\"" }, { "commit": "92839cae3f002c76cd57a278aa0abecdd3c94330", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "b574c1595d3e3c7cf712d8b9c47fe9f5d1e34b00", "67f52a94bc5be6422960deff86e130794b8095e2" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Apr 14 00:40:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 00:40:51 2023 +0000" }, "message": "docs: Fixing typos in doc comments am: 572bfdb038 am: 67f52a94bc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/22633583\n\nChange-Id: Id4a0c9299ad387840b3a450348f04c727207db58\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b574c1595d3e3c7cf712d8b9c47fe9f5d1e34b00", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "51b83aadf73c8444c30241f04a68a5d1a876dfa5", "cf2d6a8b9daaaf0f337a4422520003971ff1acf0" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Apr 14 00:38:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 00:38:25 2023 +0000" }, "message": "docs: Fixing typos in doc comments am: 572bfdb038 am: cf2d6a8b9d\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/22633583\n\nChange-Id: I763cf8a5eb89eabcc2c93989277b3ccf335a3d82\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cf2d6a8b9daaaf0f337a4422520003971ff1acf0", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "3471f4cbb265bc98e3a8f4e8e4a600c2923d81e1", "572bfdb0380e304d023aedc42e3bb5fe4729c05f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Apr 14 00:11:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 00:11:26 2023 +0000" }, "message": "docs: Fixing typos in doc comments am: 572bfdb038\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/22633583\n\nChange-Id: I6c1a38f8ced55549b4571c41aa10d3d7f634c1eb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "67f52a94bc5be6422960deff86e130794b8095e2", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "68e10dc7d282169fb630894516c8af5200d48a0e", "572bfdb0380e304d023aedc42e3bb5fe4729c05f" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Fri Apr 14 00:10:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Apr 14 00:10:33 2023 +0000" }, "message": "docs: Fixing typos in doc comments am: 572bfdb038\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/22633583\n\nChange-Id: Iaf53159daadb35f35cd9a49662a8824f835dd5a3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "572bfdb0380e304d023aedc42e3bb5fe4729c05f", "tree": "e9924b64a83621683f9ae9bef6a67193a16edc15", "parents": [ "3471f4cbb265bc98e3a8f4e8e4a600c2923d81e1" ], "author": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Apr 13 21:16:19 2023 +0000" }, "committer": { "name": "Andrew Solovay", "email": "asolovay@google.com", "time": "Thu Apr 13 23:22:51 2023 +0000" }, "message": "docs: Fixing typos in doc comments\n\nNeed to make some doc edits to verify our instructions for making\nreference doc fixes, so I ran the common_typos linter to identify some\nfixes to make. Only typo fixes, no meaningful changes to doc content (and\nno changes to code). Still worth making these changes, since the typos\nlinter will raise warnings every time we try to publish updated docs.\n\n\nBug: 278120741\nChange-Id: I02c9eb59eabf16a5b862ae78670d31db6e1fc15f\nTest: [ABTD docs build: https://android-build.googleplex.com/builds/abtd/run/L39300000959916024]\n" }, { "commit": "51b83aadf73c8444c30241f04a68a5d1a876dfa5", "tree": "0d8130410b485fa40c8bc0960c8af81227be5ee5", "parents": [ "e44337baead572923c4ea8a6534621dca8dc0abc", "68e10dc7d282169fb630894516c8af5200d48a0e" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Wed Feb 22 01:33:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 01:33:30 2023 +0000" }, "message": "Set logging for SipAudioCall to FALSE. am: 3471f4cbb2 am: 68e10dc7d2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/21488867\n\nChange-Id: I36bada99995154286fe63c4ee0995ede9856050e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "68e10dc7d282169fb630894516c8af5200d48a0e", "tree": "0d8130410b485fa40c8bc0960c8af81227be5ee5", "parents": [ "e49db91a6fec61106f0604ec5eb19a3f5d89f0ce", "3471f4cbb265bc98e3a8f4e8e4a600c2923d81e1" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Tue Feb 21 23:00:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 21 23:00:52 2023 +0000" }, "message": "Set logging for SipAudioCall to FALSE. am: 3471f4cbb2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/21488867\n\nChange-Id: I5693bcc068d46c700e83cd8ee01d9c2cbfd9a258\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e44337baead572923c4ea8a6534621dca8dc0abc", "tree": "0d8130410b485fa40c8bc0960c8af81227be5ee5", "parents": [ "e49db91a6fec61106f0604ec5eb19a3f5d89f0ce", "3471f4cbb265bc98e3a8f4e8e4a600c2923d81e1" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Tue Feb 21 22:57:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 21 22:57:27 2023 +0000" }, "message": "Set logging for SipAudioCall to FALSE. am: 3471f4cbb2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/21488867\n\nChange-Id: I5c96d4bdbe97b96b2b7fdc739deea5ddfd4c9594\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3471f4cbb265bc98e3a8f4e8e4a600c2923d81e1", "tree": "0d8130410b485fa40c8bc0960c8af81227be5ee5", "parents": [ "e49db91a6fec61106f0604ec5eb19a3f5d89f0ce" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Feb 18 01:15:31 2023 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Feb 18 01:17:04 2023 +0000" }, "message": "Set logging for SipAudioCall to FALSE.\n\nThis prevents potentially logging pii related to SIP.\n\nTest: Manual test.\nFixes: 233606950\nChange-Id: I93ffc133f4f4338d99ba625f17b96fe01c2284f7\n" }, { "commit": "8aef2fc9866134399e39b2a4444e5070dbb3b6c5", "tree": "0d8130410b485fa40c8bc0960c8af81227be5ee5", "parents": [ "e49db91a6fec61106f0604ec5eb19a3f5d89f0ce" ], "author": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Feb 18 01:15:31 2023 +0000" }, "committer": { "name": "Tyler Gunn", "email": "tgunn@google.com", "time": "Sat Feb 18 01:15:31 2023 +0000" }, "message": "Set logging for SipAudioCall to FALSE.\n\nThis prevents potentially logging pii related to SIP.\n\nTest: Manual test.\nFixes: 233606950\nChange-Id: I93ffc133f4f4338d99ba625f17b96fe01c2284f7\n" }, { "commit": "e49db91a6fec61106f0604ec5eb19a3f5d89f0ce", "tree": "d91d4c10d5e7287b80c7765269555aa7d1c8ec3d", "parents": [ "0356bb246e02990b147a478810f274736f2aa098" ], "author": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Tue Oct 04 17:11:32 2022 -0500" }, "committer": { "name": "Michael Groover", "email": "mpgroover@google.com", "time": "Tue Oct 04 17:11:32 2022 -0500" }, "message": "Add unaudited exported flag to exposed runtime receivers\n\nAndroid T allows apps to declare a runtime receiver as not exported\nby invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;\nreceivers registered with this flag will only receive broadcasts from\nthe platform and the app itself. However to ensure developers can\nproperly protect their receivers, all apps targeting U or later\nregistering a receiver for non-system broadcasts must specify either\nthe exported or not exported flag when invoking #registerReceiver;\nif one of these flags is not provided, the platform will throw a\nSecurityException. This commit updates all the exposed receivers\nwith a new RECEIVER_EXPORTED_UNAUDITED flag to maintain the existing\nbehavior of exporting the receiver while also flagging the receiver\nfor audit before the U release.\n\nBug: 234659204\nTest: Build\nChange-Id: Ie64de4dfa3dbe20e389539be1ba4105eb789b3ef\n" }, { "commit": "0356bb246e02990b147a478810f274736f2aa098", "tree": "ed4a17a303ebd71a80fd2d025f21bbb0b474e769", "parents": [ "a8953ccf373903b9ca28b56304a4b17de573fb7a", "b61b148c40d67491b5a199c60f8543b61be2e9a2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 08:25:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 08:25:31 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge Android 13\" am: 18132dcad5 -s ours am: 6f6a3c4d93 -s ours am: c42d47c18e -s ours am: b61b148c40 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: I299b13076118906203eee237ceafe41d82b5267e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a8953ccf373903b9ca28b56304a4b17de573fb7a", "tree": "ed4a17a303ebd71a80fd2d025f21bbb0b474e769", "parents": [ "096e81aca0776bbcc8d7df22a9ee94f54e867b73", "da18ed0e4f907adc3afa1d06a5af030de590fe97" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 08:25:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 08:25:30 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours am: 14aa414833 -s ours am: b9be3bdce3 -s ours am: da18ed0e4f -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: Ibed0b7e7b8fa14c13565bfce98d3b9cd21a261b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b61b148c40d67491b5a199c60f8543b61be2e9a2", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "da18ed0e4f907adc3afa1d06a5af030de590fe97", "c42d47c18eeafa0aeef26455ae785df226ef9d48" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 00:55:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 00:55:21 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge Android 13\" am: 18132dcad5 -s ours am: 6f6a3c4d93 -s ours am: c42d47c18e -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: Ia5d810bae88de80e9999ce4d183bc9a112937d18\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "da18ed0e4f907adc3afa1d06a5af030de590fe97", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "e9e45a5df9618714d03933cd97868aa83e74a9fd", "b9be3bdce3c9775627f76ebd6cebc6ffff3b7e70" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 00:55:20 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 00:55:20 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours am: 14aa414833 -s ours am: b9be3bdce3 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: I837deab54a62c15cacef48e85e227e30eaed30f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c42d47c18eeafa0aeef26455ae785df226ef9d48", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "b9be3bdce3c9775627f76ebd6cebc6ffff3b7e70", "6f6a3c4d9328cf06bfbd3cd740933627e763efc6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 00:01:57 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 00:01:57 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge Android 13\" am: 18132dcad5 -s ours am: 6f6a3c4d93 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: I86e559574a332ae6d0c7be5ebfbe3c73c2b40c2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9be3bdce3c9775627f76ebd6cebc6ffff3b7e70", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "717b79094ebf677ee50652264df90b1f601ec3ea", "14aa4148337dafcb12b053e6cf0dc416a587ada6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 17 00:01:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 17 00:01:56 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours am: 14aa414833 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: Ie9611ab73bc62f651f457d18b43723093ceca07b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f6a3c4d9328cf06bfbd3cd740933627e763efc6", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "14aa4148337dafcb12b053e6cf0dc416a587ada6", "18132dcad5f7c2f153992122035e586245587d73" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 16 23:19:05 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 16 23:19:05 2022 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge Android 13\" am: 18132dcad5 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: Ib534b99fb15e25d154c1101770eca9e27f96321e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "14aa4148337dafcb12b053e6cf0dc416a587ada6", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "655b6432fb2e792fe1bbd67e4fa9912ec2dbf5d8", "8ea1d3ceb419e4f967f230b02b3c5d484470320c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 16 23:19:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 16 23:19:04 2022 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge Android 13 am: 8ea1d3ceb4 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/2186749\n\nChange-Id: Ibeca1b1f96321469487e90775d11d11977cce1b2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "18132dcad5f7c2f153992122035e586245587d73", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "cd9afb673ed5c672a885221f5d1f95740a96fc6e", "8ea1d3ceb419e4f967f230b02b3c5d484470320c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 16 19:11:29 2022 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 16 19:11:29 2022 +0000" }, "message": "Merge \"DO NOT MERGE - Merge Android 13\"" }, { "commit": "8ea1d3ceb419e4f967f230b02b3c5d484470320c", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "cd9afb673ed5c672a885221f5d1f95740a96fc6e", "fc695ac703ad5eef516670867e4a92f4c9dc33cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 15 22:03:39 2022 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 15 22:03:39 2022 -0700" }, "message": "DO NOT MERGE - Merge Android 13\n\nBug: 242648940\nMerged-In: If930fd561557531d52fb1b2b0e8563515d7a69ff\nChange-Id: Ie7d9c2f7322241480c0e71ad9757efadf4f62044\n" }, { "commit": "096e81aca0776bbcc8d7df22a9ee94f54e867b73", "tree": "ed4a17a303ebd71a80fd2d025f21bbb0b474e769", "parents": [ "634f6e6ce92776ecc62640affc5267ab9f31e2e1", "e9e45a5df9618714d03933cd97868aa83e74a9fd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 30 01:05:33 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 30 01:05:33 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: fc695ac703 -s ours am: 655b6432fb -s ours am: 717b79094e -s ours am: e9e45a5df9 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218\n\nChange-Id: I4dfa85f266a555b3bb73e7dbd76c71dd56a9af6e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e9e45a5df9618714d03933cd97868aa83e74a9fd", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa", "717b79094ebf677ee50652264df90b1f601ec3ea" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 30 00:03:00 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 30 00:03:00 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: fc695ac703 -s ours am: 655b6432fb -s ours am: 717b79094e -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218\n\nChange-Id: I6cf1561c3bed81c1a9796943f2a3c2d4b2c90b5a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "717b79094ebf677ee50652264df90b1f601ec3ea", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa", "655b6432fb2e792fe1bbd67e4fa9912ec2dbf5d8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 29 22:57:20 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 22:57:20 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: fc695ac703 -s ours am: 655b6432fb -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218\n\nChange-Id: I71f1d444f6ce902b058bfdb0b9f4b499a60ea29c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "655b6432fb2e792fe1bbd67e4fa9912ec2dbf5d8", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa", "fc695ac703ad5eef516670867e4a92f4c9dc33cd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 29 22:13:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 22:13:46 2022 +0000" }, "message": "[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: fc695ac703 -s ours\n\nam skip reason: Merged-In If930fd561557531d52fb1b2b0e8563515d7a69ff with SHA-1 4aba9d383f is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/19093218\n\nChange-Id: I1a879723bfd4082bdcda5e755c0923073f40f9a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fc695ac703ad5eef516670867e4a92f4c9dc33cd", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "cd9afb673ed5c672a885221f5d1f95740a96fc6e", "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 27 23:38:50 2022 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 27 23:38:50 2022 +0000" }, "message": "Merge tm-dev-plus-aosp-without-vendor@8763363\n\nBug: 236760014\nMerged-In: If930fd561557531d52fb1b2b0e8563515d7a69ff\nChange-Id: Iecfcf430e3219382180c1a6a78ded10cd50f77fe\n" }, { "commit": "634f6e6ce92776ecc62640affc5267ab9f31e2e1", "tree": "ed4a17a303ebd71a80fd2d025f21bbb0b474e769", "parents": [ "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa" ], "author": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Tue May 17 19:25:46 2022 -0400" }, "committer": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Tue May 17 19:25:46 2022 -0400" }, "message": "Update AudioEffect caller to new interface\n\nTest: Compiles\nBug: 199156212\nChange-Id: I55def4d5eda53f0e6867d882ff099d31f931fccd\n" }, { "commit": "4416f10f73cc3ab4d4a567dd28f1a3b53e0db0fa", "tree": "efc3d4258cbc76e12e20cef52aa73c00ef8c85c2", "parents": [ "ccce02bc8dd512724868c6940eee6ec370a20dff", "4aba9d383f09d999e0f683468e19e246c0ea450f" ], "author": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Mon Feb 14 17:19:30 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Feb 14 17:19:30 2022 +0000" }, "message": "Merge \"Update AudioTrack/Record buffer interface\"" }, { "commit": "4aba9d383f09d999e0f683468e19e246c0ea450f", "tree": "fe3acff5e1226afda75e5a1c11d139304182fdcd", "parents": [ "37d89316169bc4c0c2a8c5a8049477cf6bac3ba9" ], "author": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Tue Jan 18 13:37:52 2022 -0500" }, "committer": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Mon Feb 07 20:32:55 2022 +0000" }, "message": "Update AudioTrack/Record buffer interface\n\nTest: Compiles\nBug: 216175830\nChange-Id: If930fd561557531d52fb1b2b0e8563515d7a69ff\n" }, { "commit": "ccce02bc8dd512724868c6940eee6ec370a20dff", "tree": "2add38bf9069755accee81cd1d74a7d57120a01b", "parents": [ "37d89316169bc4c0c2a8c5a8049477cf6bac3ba9" ], "author": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Wed Jan 26 18:05:45 2022 -0500" }, "committer": { "name": "Atneya Nair", "email": "atneya@google.com", "time": "Wed Jan 26 23:30:26 2022 +0000" }, "message": "Update AudioGroup to call new AudioTrack/Rec set\n\nTest: Compiles\nBug: 199156212\nChange-Id: I5d33e138716e304feace6c9be276a5a55ca61c63\n" }, { "commit": "37d89316169bc4c0c2a8c5a8049477cf6bac3ba9", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "92485a25ba19beaca2a193b3d9e4fa6351f92c09", "cd9afb673ed5c672a885221f5d1f95740a96fc6e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 09:00:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 09:00:20 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours am: cd9afb673e -s ours\n\nam skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378\n\nChange-Id: Ie098fba96fbe645ed41f187b3b5de1eb46d73b20\n" }, { "commit": "cd9afb673ed5c672a885221f5d1f95740a96fc6e", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "bdfd9b4a76260ee66cd5ea7618bfd53fb9a2fc67", "49668fcb0ef575e365e3bc83f8c92a1d4d8e2859" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 08:30:10 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 08:30:10 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours am: 49668fcb0e -s ours\n\nam skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378\n\nChange-Id: I853dd4d059492ffaac61ef4fd9c8ed0143ecb284\n" }, { "commit": "49668fcb0ef575e365e3bc83f8c92a1d4d8e2859", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "df427d2297b3ce6124cccdaac6989bdbffc477cc", "b3aa668458c80aa36c1ba759192d7ad2b874beaf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 07:57:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 07:57:12 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: a4437a549e -s ours am: ba3fe43201 -s ours am: b3aa668458 -s ours\n\nam skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378\n\nChange-Id: I8f7b5f08864b631733d38a880cd2b87d6b8258d7\n" }, { "commit": "b3aa668458c80aa36c1ba759192d7ad2b874beaf", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "883e10b6eb4fbb1bbce51fda70d053ebf11a78d1", "ba3fe432019e9c0b8a2ddb2257bb04bb9b246ecc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:39:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:39:56 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: a4437a549e -s ours am: ba3fe43201 -s ours\n\nam skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378\n\nChange-Id: I6d9b2458619b757c3b3f2768d686b83192663fa6\n" }, { "commit": "ba3fe432019e9c0b8a2ddb2257bb04bb9b246ecc", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "a1de4c6517ec3d392a545590f4b18a090fe236c6", "a4437a549e23a039cbc9d7ecc5887d724a6f279b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 08 01:20:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 08 01:20:30 2021 +0000" }, "message": "[automerger skipped] Merge \"Merge Android 12\" am: a4437a549e -s ours\n\nam skip reason: Merged-In I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e with SHA-1 a1de4c6517 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1847378\n\nChange-Id: I42ee571e8120ae258630b8b09f372f155e1cb79e\n" }, { "commit": "a4437a549e23a039cbc9d7ecc5887d724a6f279b", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c08addd87806e322a93a9d5edfea9dc495e6beba", "9c6571b867cd4ad6f1bf80c7f140739d2846178b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 07 23:50:25 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 07 23:50:25 2021 +0000" }, "message": "Merge \"Merge Android 12\"" }, { "commit": "9c6571b867cd4ad6f1bf80c7f140739d2846178b", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c08addd87806e322a93a9d5edfea9dc495e6beba", "a1de4c6517ec3d392a545590f4b18a090fe236c6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:37 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 06 22:53:37 2021 +0000" }, "message": "Merge Android 12\n\nBug: 202323961\nMerged-In: I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e\nChange-Id: Ia6369c6e114a1212de7bf9c3b09448d3b747e1b6\n" }, { "commit": "92485a25ba19beaca2a193b3d9e4fa6351f92c09", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "afad476dc56a815cdc4a4a7cd53ef3afcfdfdc6e", "bdfd9b4a76260ee66cd5ea7618bfd53fb9a2fc67" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Aug 18 00:24:19 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 18 00:24:19 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours am: 883e10b6eb -s ours am: df427d2297 -s ours am: bdfd9b4a76 -s ours\n\nam skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807\n\nChange-Id: I4363495fd3ad12b5d071a183c347a394608e34d8\n" }, { "commit": "bdfd9b4a76260ee66cd5ea7618bfd53fb9a2fc67", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "30a9090c7c22c30341c96198354ec201c37ada4a", "df427d2297b3ce6124cccdaac6989bdbffc477cc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 20:33:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 20:33:00 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours am: 883e10b6eb -s ours am: df427d2297 -s ours\n\nam skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807\n\nChange-Id: I8e1b5e426a3e75275918dcb58d211041e24ed439\n" }, { "commit": "df427d2297b3ce6124cccdaac6989bdbffc477cc", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "f36a184648f7588f2ce4a650789287f0adc9685c", "883e10b6eb4fbb1bbce51fda70d053ebf11a78d1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 19:46:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 19:46:56 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours am: 883e10b6eb -s ours\n\nam skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807\n\nChange-Id: Ic4878c98a53221989c4d7bcdaf4bbdcfc780cfa8\n" }, { "commit": "883e10b6eb4fbb1bbce51fda70d053ebf11a78d1", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "f36a184648f7588f2ce4a650789287f0adc9685c", "a1de4c6517ec3d392a545590f4b18a090fe236c6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 17 18:36:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 17 18:36:25 2021 +0000" }, "message": "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: a1de4c6517 -s ours\n\nam skip reason: Merged-In Ida30b3f19b975f65b66ef39540dd45c460911b53 with SHA-1 f36a184648 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15571807\n\nChange-Id: I893c2b6c91eae5b02f6830ef3194d71dfc43cc13\n" }, { "commit": "a1de4c6517ec3d392a545590f4b18a090fe236c6", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "5ef5b9278f5647108a4b127a3da8f18d05a4dd21", "f36a184648f7588f2ce4a650789287f0adc9685c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:31:22 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Aug 14 06:31:22 2021 +0000" }, "message": "Merge sc-dev-plus-aosp-without-vendor@7634622\n\nMerged-In: Ida30b3f19b975f65b66ef39540dd45c460911b53\nChange-Id: I2ae85401e7ede34a6b4f04d82ee597ae6fd4575e\n" }, { "commit": "afad476dc56a815cdc4a4a7cd53ef3afcfdfdc6e", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "e600f4d47c2a56538002a317ddee11812ac61a0c", "30a9090c7c22c30341c96198354ec201c37ada4a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 21 17:23:03 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 21 17:23:03 2021 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge RQ3A.210605.005\" am: c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -s ours am: 30a9090c7c -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481\n\nChange-Id: I851f8043806e5a151703a1e7acda9007bf0d866f\n" }, { "commit": "30a9090c7c22c30341c96198354ec201c37ada4a", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "8749a3714ca8177f3b23c8ae33beecd8a0d22959", "f36a184648f7588f2ce4a650789287f0adc9685c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 21 16:14:43 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 21 16:14:43 2021 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge RQ3A.210605.005\" am: c08addd878 -s ours am: 5ef5b9278f -s ours am: f36a184648 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481\n\nChange-Id: Ibfba967ae1dd7d17fad2f843c20679169b010d17\n" }, { "commit": "f36a184648f7588f2ce4a650789287f0adc9685c", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "3e6f48b1db6c4739cfdd100584764a50462c0cf9", "5ef5b9278f5647108a4b127a3da8f18d05a4dd21" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 21 06:42:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 21 06:42:54 2021 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge RQ3A.210605.005\" am: c08addd878 -s ours am: 5ef5b9278f -s ours\n\nam skip reason: Merged-In Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 with SHA-1 c21e847348 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481\n\nChange-Id: Ida30b3f19b975f65b66ef39540dd45c460911b53\n" }, { "commit": "5ef5b9278f5647108a4b127a3da8f18d05a4dd21", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "c21e84734803d4e6b103d6f79c6e5e5fa353d4f8", "c08addd87806e322a93a9d5edfea9dc495e6beba" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 21 06:11:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 21 06:11:02 2021 +0000" }, "message": "[automerger skipped] Merge \"DO NOT MERGE - Merge RQ3A.210605.005\" am: c08addd878 -s ours\n\nam skip reason: Merged-In Ia8161dc461f79edacbc59a3b0e09323d1d4508c7 with SHA-1 c21e847348 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1741481\n\nChange-Id: Ie980435af6796a0e9045e4755e601ea67865bd69\n" }, { "commit": "c08addd87806e322a93a9d5edfea9dc495e6beba", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "e6550d3e98715465d146a6e35f3354199beefbbb", "5ece0e810a84e18a3b2f1ba2abfa05da95549905" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 21 05:49:03 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jun 21 05:49:03 2021 +0000" }, "message": "Merge \"DO NOT MERGE - Merge RQ3A.210605.005\"" }, { "commit": "5ece0e810a84e18a3b2f1ba2abfa05da95549905", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "e6550d3e98715465d146a6e35f3354199beefbbb", "c21e84734803d4e6b103d6f79c6e5e5fa353d4f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 12:24:55 2021 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 12:24:55 2021 -0700" }, "message": "DO NOT MERGE - Merge RQ3A.210605.005\n\nBug: 190855093\nMerged-In: Ia8161dc461f79edacbc59a3b0e09323d1d4508c7\nChange-Id: I6f82b47ce0238178179681c918cecaedb733e18d\n" }, { "commit": "e600f4d47c2a56538002a317ddee11812ac61a0c", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "3633a64c88111b340b660064fa9c9536abc2fa96", "8749a3714ca8177f3b23c8ae33beecd8a0d22959" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 06:51:53 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 06:51:53 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c21e847348 -s ours am: 3e6f48b1db -s ours am: 8749a3714c -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960\n\nChange-Id: I9e3e0e9d494359d74b3a610504f2b34a12808ea8\n" }, { "commit": "8749a3714ca8177f3b23c8ae33beecd8a0d22959", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "6a14b5344eba5d8a7c7c1b137d0fa1bc45a7990c", "3e6f48b1db6c4739cfdd100584764a50462c0cf9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 06:34:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 06:34:30 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c21e847348 -s ours am: 3e6f48b1db -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960\n\nChange-Id: I826c5d04ce36686d8e3eed6ef41447e7ad0c1260\n" }, { "commit": "3e6f48b1db6c4739cfdd100584764a50462c0cf9", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c8f602d4d01a0ed1e80aa58ea89602ef2e684e4a", "c21e84734803d4e6b103d6f79c6e5e5fa353d4f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 06:18:58 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 06:18:58 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c21e847348 -s ours\n\nam skip reason: Merged-In Ic06907b897166d632b67dac8151b3cd62e5e4c20 with SHA-1 35022088c6 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/15023960\n\nChange-Id: Ia57d190c54cc932ae074c8ae9fdd86141face275\n" }, { "commit": "c21e84734803d4e6b103d6f79c6e5e5fa353d4f8", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "35022088c67f06d4e128715703b28a87a5c51f09", "702a3e75d6c432a96db2481f5748953c9d69cc86" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 17 22:43:29 2021 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 17 22:43:29 2021 -0700" }, "message": "DO NOT MERGE - Mark RQ3A.210410.001 as merged\n\nBug: 190855093\nMerged-In: Ic06907b897166d632b67dac8151b3cd62e5e4c20\nChange-Id: Ia8161dc461f79edacbc59a3b0e09323d1d4508c7\n" }, { "commit": "3633a64c88111b340b660064fa9c9536abc2fa96", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "48891ce6dd8bb9e0912f1a08138d06bac95be2e0", "6a14b5344eba5d8a7c7c1b137d0fa1bc45a7990c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 01:23:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 01:23:01 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -s ours am: 6a14b5344e -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087\n\nChange-Id: I4697b590153258486493ea46ba5cf1a07a3ded67\n" }, { "commit": "6a14b5344eba5d8a7c7c1b137d0fa1bc45a7990c", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "36d8fba511f97b203fa7cb052fe7dd7be9ce6f48", "c8f602d4d01a0ed1e80aa58ea89602ef2e684e4a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 00:57:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 00:57:16 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours am: c8f602d4d0 -s ours\n\nam skip reason: subject contains skip directive\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087\n\nChange-Id: I42140b7f4355e2d29f751ed0a454fe54254635b7\n" }, { "commit": "c8f602d4d01a0ed1e80aa58ea89602ef2e684e4a", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "5193d5e2114341d7db3c078a0a1cc9639e984b7e", "35022088c67f06d4e128715703b28a87a5c51f09" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Jun 18 00:51:59 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 18 00:51:59 2021 +0000" }, "message": "[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 35022088c6 -s ours\n\nam skip reason: Merged-In I2087170aceb7c0670afd04fcc779047aa95a373f with SHA-1 0e459673aa is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14974087\n\nChange-Id: Ife2f6fb0e39e46724a09a8e059f5442eed22c90a\n" }, { "commit": "35022088c67f06d4e128715703b28a87a5c51f09", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "694bef43fccba2c321e2b0ea591dee24538ff420", "fa927d5d9c4e2cde6ba5a4ece0f8c247657467f3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 14 21:52:17 2021 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 17 22:39:34 2021 +0000" }, "message": "DO NOT MERGE - Merge ab/7272582\n\nBug: 190855093\nMerged-In: I2087170aceb7c0670afd04fcc779047aa95a373f\nChange-Id: Ic06907b897166d632b67dac8151b3cd62e5e4c20\n" }, { "commit": "48891ce6dd8bb9e0912f1a08138d06bac95be2e0", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "c7be9ad6584f7bad95afc000f382e446824e8481", "15bb2977b870495211117548ea132810e8cff7c9" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Mon Jun 07 02:55:06 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 07 02:55:06 2021 +0000" }, "message": "[automerger skipped] Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25 am: 15bb2977b8 -s ours\n\nam skip reason: Merged-In Iec62f7afa8ca128886a85f425f7a92122ed2155c with SHA-1 599af3cf25 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: Ic956ffd32fc3ee0f0372271f913937b567b7cb48\n" }, { "commit": "c7be9ad6584f7bad95afc000f382e446824e8481", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "a1f053c3a58b2a7fa55d806eb0cd1d4704a279c9", "36d8fba511f97b203fa7cb052fe7dd7be9ce6f48" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jun 04 01:43:04 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 01:43:04 2021 +0000" }, "message": "[automerger skipped] Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25 am: 249aaffa82 -s ours am: 36d8fba511 -s ours\n\nam skip reason: Merged-In Iec62f7afa8ca128886a85f425f7a92122ed2155c with SHA-1 599af3cf25 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: If676301bcc7fa68f2eda83899d0db9eaae546522\n" }, { "commit": "36d8fba511f97b203fa7cb052fe7dd7be9ce6f48", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "5142cba6f7b3444a5f0acf6728416aed27598b4d", "249aaffa826133b9223244f455a3654b391076bd" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Fri Jun 04 01:10:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jun 04 01:10:20 2021 +0000" }, "message": "[automerger skipped] Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25 am: 249aaffa82 -s ours\n\nam skip reason: Merged-In Iec62f7afa8ca128886a85f425f7a92122ed2155c with SHA-1 599af3cf25 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: Ic70e0bf0d8dc776f5444e9c4264ac42abce1fc5f\n" }, { "commit": "249aaffa826133b9223244f455a3654b391076bd", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c8ad014540f03fac91500babb313b20e5d581726", "599af3cf252fbd5fd8dc00ad5f9a28947d6f62d4" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Thu Jun 03 07:17:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 03 07:17:56 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: I15a31fc8e824cd44470f31fce6a195c6c8836ebf\n" }, { "commit": "a1f053c3a58b2a7fa55d806eb0cd1d4704a279c9", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "3f9ed608da348f42c5187ccbe416f3acfacb84d2", "5142cba6f7b3444a5f0acf6728416aed27598b4d" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jun 02 23:33:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 02 23:33:22 2021 +0000" }, "message": "[automerger skipped] Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25 am: 5193d5e211 am: 5142cba6f7 -s ours\n\nam skip reason: Merged-In Iec62f7afa8ca128886a85f425f7a92122ed2155c with SHA-1 2ee37a8d21 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: I84c49323cdfcf203f058fae42fb881a95de343b6\n" }, { "commit": "5142cba6f7b3444a5f0acf6728416aed27598b4d", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c8ad014540f03fac91500babb313b20e5d581726", "5193d5e2114341d7db3c078a0a1cc9639e984b7e" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jun 02 23:28:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 02 23:28:02 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25 am: 5193d5e211\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: If5f17f54871a0c9c6ca76ab5b4ba9661f03370aa\n" }, { "commit": "15bb2977b870495211117548ea132810e8cff7c9", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "bb8d18da0ff339b3e112d1b0eeb764f69fe15a0d", "599af3cf252fbd5fd8dc00ad5f9a28947d6f62d4" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jun 02 23:20:26 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 02 23:20:26 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: Ib77de07dcc32f98df7aa2b44a57a1c295e341b73\n" }, { "commit": "5193d5e2114341d7db3c078a0a1cc9639e984b7e", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c8ad014540f03fac91500babb313b20e5d581726", "599af3cf252fbd5fd8dc00ad5f9a28947d6f62d4" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Wed Jun 02 23:19:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 02 23:19:16 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip) am: 599af3cf25\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/14665721\n\nChange-Id: I8821e99b7f54c96509f3e1f7a9be6d04321a7eb9\n" }, { "commit": "599af3cf252fbd5fd8dc00ad5f9a28947d6f62d4", "tree": "c9a45b33b3c2d00e39bc4be8877abfcd86fa1e41", "parents": [ "c8ad014540f03fac91500babb313b20e5d581726" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Thu May 20 16:13:24 2021 +0000" }, "committer": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jun 01 23:40:11 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip)\n\nAttribution source is the abstraction to capture the data\nflows for private data across apps. Checking permissions\nfor an attribution source does this for all apps in the\nchain that would receive the data as well as the relevant\napp ops are checked/noted/started as needed.\n\nbug: 158792096\n\nTest: atest CtsMediaTestCases\n atest CtsPermissionTestCases\n atest CtsPermission2TestCases\n atest CtsPermission3TestCases\n atest CtsPermission4\n\nMerged-In: Iec62f7afa8ca128886a85f425f7a92122ed2155c\n\nChange-Id: Iec62f7afa8ca128886a85f425f7a92122ed2155c\n" }, { "commit": "3f9ed608da348f42c5187ccbe416f3acfacb84d2", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "f6d22ea272bbf7c73d3db5e5bc01b10e5b817e98", "2ee37a8d217c0f1c8ad5fa8e0058282b8ea85c0d" ], "author": { "name": "Svetoslav Ganov", "email": "svetoslavganov@google.com", "time": "Tue Jun 01 21:31:30 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 01 21:31:30 2021 +0000" }, "message": "Merge \"Switch media fw permissions checks to AttributionSource (voip)\"" }, { "commit": "2ee37a8d217c0f1c8ad5fa8e0058282b8ea85c0d", "tree": "2b393083d369c0e3d37eca44e936e802c5306b12", "parents": [ "35dc5e0315daed3cb86423d63f3a15fef899ff53" ], "author": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Thu May 20 16:13:24 2021 +0000" }, "committer": { "name": "Svet Ganov", "email": "svetoslavganov@google.com", "time": "Sun May 30 19:32:30 2021 +0000" }, "message": "Switch media fw permissions checks to AttributionSource (voip)\n\nAttribution source is the abstraction to capture the data\nflows for private data across apps. Checking permissions\nfor an attribution source does this for all apps in the\nchain that would receive the data as well as the relevant\napp ops are checked/noted/started as needed.\n\nbug: 158792096\n\nTest: atest CtsMediaTestCases\n atest CtsPermissionTestCases\n atest CtsPermission2TestCases\n atest CtsPermission3TestCases\n atest CtsPermission4\n\nChange-Id: Iec62f7afa8ca128886a85f425f7a92122ed2155c\n" }, { "commit": "f6d22ea272bbf7c73d3db5e5bc01b10e5b817e98", "tree": "c27617810efc46b96d8ff6c01b78a361f96ecb0e", "parents": [ "35dc5e0315daed3cb86423d63f3a15fef899ff53", "bb8d18da0ff339b3e112d1b0eeb764f69fe15a0d" ], "author": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Thu May 27 20:06:17 2021 +0000" }, "committer": { "name": "Bill Rassieur", "email": "rassb@google.com", "time": "Thu May 27 20:06:17 2021 +0000" }, "message": "Merge sc-mainline-prod to master.\n\nChange-Id: I946f5f37013c0922dd499b949524e6d821ed344c\n" }, { "commit": "35dc5e0315daed3cb86423d63f3a15fef899ff53", "tree": "c27617810efc46b96d8ff6c01b78a361f96ecb0e", "parents": [ "60fb9ade729b53214d195bbd451eb8c24f119eae", "6b29d83a18e44ebef8330415489e8fde6758903d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sun May 16 06:35:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun May 16 06:35:00 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc am: 9726373802 am: c8ad014540 am: 6b29d83a18\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: Ie4a2afb87e5ba433ff44e839cfbcb9ba1a4f0c4c\n" }, { "commit": "6b29d83a18e44ebef8330415489e8fde6758903d", "tree": "1bea755cec773569e7e41ebdc51c8311c01a42d0", "parents": [ "e3625512e2376649ef9eaf679fd70aa8936b7e2c", "c8ad014540f03fac91500babb313b20e5d581726" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 14 20:40:11 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 14 20:40:11 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc am: 9726373802 am: c8ad014540\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: I1752732a751e29820552e640bd1f66083c5ae712\n" }, { "commit": "bb8d18da0ff339b3e112d1b0eeb764f69fe15a0d", "tree": "1bea755cec773569e7e41ebdc51c8311c01a42d0", "parents": [ "bf740b080398dabedf22d72ece19d313f75e33b3", "c8ad014540f03fac91500babb313b20e5d581726" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 14 20:38:13 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 14 20:38:13 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc am: 9726373802 am: c8ad014540\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: I9eb43f1522620d6bf357d976178d13506403948c\n" }, { "commit": "60fb9ade729b53214d195bbd451eb8c24f119eae", "tree": "c27617810efc46b96d8ff6c01b78a361f96ecb0e", "parents": [ "84a775224e69b38933edfd540a41491c14306c66", "c8ad014540f03fac91500babb313b20e5d581726" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 14 20:34:12 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 14 20:34:12 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc am: 9726373802 am: c8ad014540\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: I36f29ce4510fac16419f4729a483745d1c23de8e\n" }, { "commit": "c8ad014540f03fac91500babb313b20e5d581726", "tree": "1bea755cec773569e7e41ebdc51c8311c01a42d0", "parents": [ "e3625512e2376649ef9eaf679fd70aa8936b7e2c", "972637380210c44fccb5fc98df135e1f09c2d79a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 14 19:58:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 14 19:58:25 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc am: 9726373802\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: Ia9a9fff1a6c73d09fa81af569a0a0becd3abd6d7\n" }, { "commit": "972637380210c44fccb5fc98df135e1f09c2d79a", "tree": "5c451e38e1adb035eb12ef2c6d5115e7b2636527", "parents": [ "fa927d5d9c4e2cde6ba5a4ece0f8c247657467f3", "694bef43fccba2c321e2b0ea591dee24538ff420" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Apr 14 19:10:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Apr 14 19:10:36 2021 +0000" }, "message": "Merge \"Open /dev/urandom in O_CLOEXEC mode\" am: e6550d3e98 am: 694bef43fc\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/voip/+/1675808\n\nChange-Id: I1d7e11fa75a081a70596866899269e8ae3d6036d\n" } ], "next": "694bef43fccba2c321e2b0ea591dee24538ff420" }