)]}' { "log": [ { "commit": "7096594e072aeb35b479bfc581568e89790e8a75", "tree": "cdd12cfabefd5361156d46375a0eaa7db9d15384", "parents": [ "8add736aec8c96ef8cb57b43a687aad5983dea52", "6564c44d7ec32e07bafd5cf55e14934af0507fcc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:02 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:10:02 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: Ibc6513ba88f2de0a39661fb5d5219be2bfef7d58\nChange-Id: If8ae7daed5314bac501f6b14bc14dfa3ea9ffd60\n" }, { "commit": "6564c44d7ec32e07bafd5cf55e14934af0507fcc", "tree": "cdd12cfabefd5361156d46375a0eaa7db9d15384", "parents": [ "347a1b95bdc90c0e9d782e40c0aa8c05b7a4c53d", "962a79d6c880f292de3679b7aa5c5ae7f40b6d90" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:21 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:21 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I57f32af9b093992e6ccaa8dc70ebe9a22ed328b0\nChange-Id: I684f2093158326543c1f0a71af4fae2583a6816b\n" }, { "commit": "347a1b95bdc90c0e9d782e40c0aa8c05b7a4c53d", "tree": "87afac6eff77bf1c7b1b0a93a558e360a4c4bc49", "parents": [ "1b88dcfdb2075d9d39b81a6bd5d41be15aac2003", "8add736aec8c96ef8cb57b43a687aad5983dea52" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 18:25:06 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 18:25:06 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 8add736aec -s ours\n\nam skip reason: Merged-In I4c21309c0898a52332be8e9f9483c92b59cc08c5 with SHA-1 f0882fabbe is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3414137\n\nChange-Id: I98214216699a6919a901d832ce5219eae580b4fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8add736aec8c96ef8cb57b43a687aad5983dea52", "tree": "87afac6eff77bf1c7b1b0a93a558e360a4c4bc49", "parents": [ "4487b3e1c0b5ba450d5bf3c10d5496f30f94e345", "1b88dcfdb2075d9d39b81a6bd5d41be15aac2003" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:24 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I4c21309c0898a52332be8e9f9483c92b59cc08c5\nChange-Id: Ic2d6ac287d470bc7b0e9ffd1d89fe1f37517d5fd\n" }, { "commit": "962a79d6c880f292de3679b7aa5c5ae7f40b6d90", "tree": "cdd12cfabefd5361156d46375a0eaa7db9d15384", "parents": [ "a5304f8503cb3c8051248e70ac00a1c08812e9e3", "1b88dcfdb2075d9d39b81a6bd5d41be15aac2003" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 13 22:36:57 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 22:36:57 2024 +0000" }, "message": "[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 1b88dcfdb2 -s ours\n\nam skip reason: Merged-In I4c21309c0898a52332be8e9f9483c92b59cc08c5 with SHA-1 f0882fabbe is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/30285419\n\nChange-Id: If5a39f5589369db0b93b6fc69a8c944fe04c3d03\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1b88dcfdb2075d9d39b81a6bd5d41be15aac2003", "tree": "87afac6eff77bf1c7b1b0a93a558e360a4c4bc49", "parents": [ "83a947432fdd0550c9daf8eb70bf8e8ffce8665d", "f0882fabbeea83cd0c84c150cc38f2a87706b971" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:36 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Nov 06 10:31:36 2024 -0800" }, "message": "Merge 24Q4 (ab/12406339) into aosp-main-future\n\nBug: 370570306\nMerged-In: I4c21309c0898a52332be8e9f9483c92b59cc08c5\nChange-Id: I2fe0c8c058bb49e22f3b61177918fd66195e71dd\n" }, { "commit": "a5304f8503cb3c8051248e70ac00a1c08812e9e3", "tree": "cdd12cfabefd5361156d46375a0eaa7db9d15384", "parents": [ "1db38ced962a5cc18e9bf7df82dfd3762b5d4f8e" ], "author": { "name": "rambowang", "email": "rambowang@google.com", "time": "Mon Oct 07 22:12:35 2024 -0500" }, "committer": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Fri Oct 11 21:35:51 2024 +0000" }, "message": "Support SubscriptionManager.canManagerSubscription for HSUM\n\nSM.canManageSubscription depends on the user context created from the\nSubscriptionManager object to query packages. The user context was\nsystem user within OpportunisticNetworkService and thus only system user was supported.\n\nThe change supports secondary users (e.g. Main User in HSUM) by creating\na current user context before getting the SubscriptionManager object.\n\nBug: 371452139\nTest: atest OpportunisticNetworkServiceTest FrameworksTelephonyTests\nFlag: com.android.internal.telephony.flags.hsum_package_manager\nChange-Id: I57f32af9b093992e6ccaa8dc70ebe9a22ed328b0\n" }, { "commit": "1db38ced962a5cc18e9bf7df82dfd3762b5d4f8e", "tree": "87afac6eff77bf1c7b1b0a93a558e360a4c4bc49", "parents": [ "f0882fabbeea83cd0c84c150cc38f2a87706b971", "83a947432fdd0550c9daf8eb70bf8e8ffce8665d" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 08 21:07:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 08 21:07:10 2024 +0000" }, "message": "Fixes for errorprone update am: 4487b3e1c0 am: 83a947432f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3297086\n\nChange-Id: I61405c3ffcb29743f89393851e51accb6aca20dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "83a947432fdd0550c9daf8eb70bf8e8ffce8665d", "tree": "9f8041bd045f10d2f07f1d4c26240eb7f59d0d5b", "parents": [ "c560242b4f261176d4a92b747fc1e683be9148a9", "4487b3e1c0b5ba450d5bf3c10d5496f30f94e345" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Tue Oct 08 20:53:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 08 20:53:10 2024 +0000" }, "message": "Fixes for errorprone update am: 4487b3e1c0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3297086\n\nChange-Id: I9c733ead3b72057f2e30d88c72805fc2736f69fd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4487b3e1c0b5ba450d5bf3c10d5496f30f94e345", "tree": "9f8041bd045f10d2f07f1d4c26240eb7f59d0d5b", "parents": [ "6acda35361a57509b1898ac36efb841a7d51d576" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Oct 07 11:26:05 2024 -0700" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Oct 07 11:27:08 2024 -0700" }, "message": "Fixes for errorprone update\n\nWhen updating errorprone from 2.23.0 -\u003e 2.32.0, more issues are found.\n\nBug: 253827323\nFlag: EXEMPT refactor\nTest: m RUN_ERROR_PRONE\u003dtrue javac-check\nChange-Id: I3a3f4a396bd2aab790ac27cf70dad478c8bc6eb2\n" }, { "commit": "f0882fabbeea83cd0c84c150cc38f2a87706b971", "tree": "50d2147b0d56932cfacdaa57add9e9c562d7505c", "parents": [ "2405815bba703ca283ea61bf2273f010b9a76156" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Sep 11 16:01:26 2024 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Sep 11 16:45:06 2024 -0700" }, "message": "Fix ONS to only return opportunistic subs\n\nAs part of the auto-data-switch, it became possible for\nthe ONS to accidentally return a preferred data sub-ID\nthat was not opportunistic, which broke the contract of\nTelephonyManager#getPreferredOpportunisticDataSubscription.\n\nSince there\u0027s no reason for ONS to mess with non-opportunistic\nsubs, it\u0027s safe to just have it not find one in the case that\nthe preferred sub is not an opportunistic sub.\n\nBug: 316031997\nTest: atest ONSProfileSelectorTest\nFlag: EXEMPT bugfix\nChange-Id: I4c21309c0898a52332be8e9f9483c92b59cc08c5\n" }, { "commit": "2405815bba703ca283ea61bf2273f010b9a76156", "tree": "f7f71458c039bb03b0e84bfc6c111fbeb0979103", "parents": [ "cd0be9822cbee08f9d314414987bee45a6f8c319" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Sep 11 16:02:12 2024 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Wed Sep 11 16:45:06 2024 -0700" }, "message": "Fix Typo in ONSProfileSelector\n\ns/isOpprotunistic/isOpportunistic/\n\nBug: 8675309\nTest: n/a non-functional change\nFlag: EXEMPT refactor\nChange-Id: I006d720c0e1e3eb0f139a8d9e2409c9fe87ff081\n" }, { "commit": "cd0be9822cbee08f9d314414987bee45a6f8c319", "tree": "3a54d91c5c58f71fb5ee639a66fbd33abe68650d", "parents": [ "b76e3f1a2e5a2b61a1c6227ca36cfc15abe78441", "c560242b4f261176d4a92b747fc1e683be9148a9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 03:31:10 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 03:31:10 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 6acda35361 -s ours am: c560242b4f -s ours\n\nam skip reason: Merged-In I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582 with SHA-1 4336b37520 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3258611\n\nChange-Id: I86ab7dfda1401dd45ab59b0021dc73177e2aa604\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c560242b4f261176d4a92b747fc1e683be9148a9", "tree": "b3460891444409cf2d73741c94d8ddcd02fe52bc", "parents": [ "8147de02d24b76bd6fabe9c14c06ea3f2dafc1ec", "6acda35361a57509b1898ac36efb841a7d51d576" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:45:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:45:41 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: 6acda35361 -s ours\n\nam skip reason: Merged-In I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582 with SHA-1 4336b37520 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3258611\n\nChange-Id: I241410b997f7a94fd5528aa433cecda45378c82c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6acda35361a57509b1898ac36efb841a7d51d576", "tree": "b3460891444409cf2d73741c94d8ddcd02fe52bc", "parents": [ "c00d8f9699cfe88ba17eaec77bbbf17f17829bd4", "8147de02d24b76bd6fabe9c14c06ea3f2dafc1ec" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:02 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:02 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582\nChange-Id: I8717132b42def7a61cb227d4eed4e581c090bd30\n" }, { "commit": "b76e3f1a2e5a2b61a1c6227ca36cfc15abe78441", "tree": "3a54d91c5c58f71fb5ee639a66fbd33abe68650d", "parents": [ "fb98b4a657882cd49709ac1208a75e18ca0f2bf0", "8147de02d24b76bd6fabe9c14c06ea3f2dafc1ec" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:17:54 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:17:54 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: c00d8f9699 am: 8147de02d2\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3247520\n\nChange-Id: I4adbe6354b192d0191490bd47b9da8c5f29f4956\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8147de02d24b76bd6fabe9c14c06ea3f2dafc1ec", "tree": "b3460891444409cf2d73741c94d8ddcd02fe52bc", "parents": [ "37aecef2468b8157477518910b00e4b57e6c7555", "c00d8f9699cfe88ba17eaec77bbbf17f17829bd4" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 18:00:01 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 30 18:00:01 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit am: c00d8f9699\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3247520\n\nChange-Id: I82190a23e0c64ecb95ca371df021895268afb845\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c00d8f9699cfe88ba17eaec77bbbf17f17829bd4", "tree": "c6d973416ffdea25358fdcfd428b5b0c65384ae0", "parents": [ "897db1e4256f755320572ffc8d281269527621d1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:27 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Aug 30 00:30:27 2024 +0000" }, "message": "Make java_sdk_library dependencies explicit\n\nmodules should specify the submodule of java_sdk_library that the module\nactually depends on\n\nTest: CI\nBug: 358613520\nChange-Id: Id3c451dcf7c858674ff6fa71b3edf6c7773c2812\n" }, { "commit": "fb98b4a657882cd49709ac1208a75e18ca0f2bf0", "tree": "cbfa2e35355e08cf3a8cce097e41196990642f31", "parents": [ "3250dd2b7bc4ecaecc117db2dca6bf4300191cc4" ], "author": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Fri Jul 12 19:35:34 2024 +0000" }, "committer": { "name": "Jared Duke", "email": "jdduke@google.com", "time": "Fri Jul 12 19:35:34 2024 +0000" }, "message": "Don\u0027t link framework aconfig libs for platform targets\n\nThe framework links in a select set of aconfig flag libs. Targets that\nuse `platform_apis: true` can and should reuse these flags, rather than\nlinking in a redundant copy that conflicts with the bootclasspath.\n\nBug: 222468116\nTest: m + presubmit\nFlag: EXEMPT refactor\nChange-Id: I90ddd82e886d0ad2a8f1101f0d94e40d4f697ebb\n" }, { "commit": "3250dd2b7bc4ecaecc117db2dca6bf4300191cc4", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "c6ac582b9d53b3851fbea329855e27b695c5d19e", "37aecef2468b8157477518910b00e4b57e6c7555" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 19:56:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 19:56:53 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 37aecef246 -s ours\n\nam skip reason: Merged-In I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582 with SHA-1 4336b37520 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/27909260\n\nChange-Id: I1db473550eba7b2d9dcc6448a2abcd9b2a00a5dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "37aecef2468b8157477518910b00e4b57e6c7555", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "8e5bdc9444bed3a550c4c84838faff33c0376324", "02dbd3a100f23d6f8ccbcc98e8a893aab528e40c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:47 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582\nChange-Id: Ic965772a95e46326dc54b2d0f52a371479844599\n" }, { "commit": "c6ac582b9d53b3851fbea329855e27b695c5d19e", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "02dbd3a100f23d6f8ccbcc98e8a893aab528e40c", "8e5bdc9444bed3a550c4c84838faff33c0376324" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 06:08:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 06:08:53 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 897db1e425 -s ours am: 8e5bdc9444 -s ours\n\nam skip reason: Merged-In Ie13963793b31f26f1306e5043c6c2cf792a2310e with SHA-1 24aef2f134 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3132199\n\nChange-Id: Ic4840f8b6ea0abdd4b4bd2698f5caeb813554ad4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8e5bdc9444bed3a550c4c84838faff33c0376324", "tree": "8a371270b5d7e8a7ff8fc8f26b811a3cb5ce614b", "parents": [ "24aef2f134150d009f383cd2729fdcf1e888d96d", "897db1e4256f755320572ffc8d281269527621d1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 19:55:03 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 19:55:03 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 897db1e425 -s ours\n\nam skip reason: Merged-In Ie13963793b31f26f1306e5043c6c2cf792a2310e with SHA-1 24aef2f134 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/3132199\n\nChange-Id: I4c247070e309ae0ed47f67ea04929813ec9265c2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "897db1e4256f755320572ffc8d281269527621d1", "tree": "8a371270b5d7e8a7ff8fc8f26b811a3cb5ce614b", "parents": [ "dd04e1e7b871b3149251293c63575d4293422d51", "24aef2f134150d009f383cd2729fdcf1e888d96d" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:42 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:42 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: Ie13963793b31f26f1306e5043c6c2cf792a2310e\nChange-Id: I1a3430de66ac492e9d587d81b91a96787d16df02\n" }, { "commit": "02dbd3a100f23d6f8ccbcc98e8a893aab528e40c", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "c27a1e81fe5cc83773a737f0a4ae65413adb2fef", "24aef2f134150d009f383cd2729fdcf1e888d96d" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Wed May 29 22:04:47 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 22:04:47 2024 +0000" }, "message": "[automerger skipped] Update unit test including vendor API level am: 24aef2f134 -s ours\n\nam skip reason: Merged-In Ie13963793b31f26f1306e5043c6c2cf792a2310e with SHA-1 29dc68f7c5 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/27579087\n\nChange-Id: I0bb38f03459464e458fdb748ebbd8632bb4a43b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c27a1e81fe5cc83773a737f0a4ae65413adb2fef", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "682fd5cd3f2eb474a68dc470cb2e78a4e35b1407", "845c6a8c374fa3ea163fa3d86e65b76c52e47423" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Wed May 29 22:04:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 22:04:42 2024 +0000" }, "message": "[automerger skipped] Skip to check telephony feature mapping when the SDK version of vendor partition is less thant Android V am: 845c6a8c37 -s ours\n\nam skip reason: Merged-In I6f17ad7efa33754a658cdf502400cf4ad3933258 with SHA-1 58d801208b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/27579086\n\nChange-Id: Ib2f26b818eb35a1ff0aecba7f3d3ffaec85081bf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "682fd5cd3f2eb474a68dc470cb2e78a4e35b1407", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "4336b37520a82a46bd01d5520ce64fd50a0c456c", "88cecddb69b04e7bca9d1c2656b8894aa0b9a9ad" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 29 20:49:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 20:49:15 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 88cecddb69 -s ours\n\nam skip reason: Merged-In I80978aa2be6edabd6a09f22be2c561e1bdb64f78 with SHA-1 460fde2bc1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/27273284\n\nChange-Id: I985fbfc8289bb24fce0a04b1aa6f8e93aaa7e38d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "24aef2f134150d009f383cd2729fdcf1e888d96d", "tree": "8a371270b5d7e8a7ff8fc8f26b811a3cb5ce614b", "parents": [ "845c6a8c374fa3ea163fa3d86e65b76c52e47423" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Thu Apr 18 16:34:26 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed May 29 17:07:32 2024 +0000" }, "message": "Update unit test including vendor API level\n\nBug: 335362916\nTest: atest OpportunisticNetworkServiceTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29dc68f7c53b5b06dd65389ca59ab6af43bca81b)\nMerged-In: Ie13963793b31f26f1306e5043c6c2cf792a2310e\nChange-Id: Ie13963793b31f26f1306e5043c6c2cf792a2310e\n" }, { "commit": "845c6a8c374fa3ea163fa3d86e65b76c52e47423", "tree": "302ca8ea4e7807d4b03ecf39c126a4fea306b067", "parents": [ "88cecddb69b04e7bca9d1c2656b8894aa0b9a9ad" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Thu Apr 18 04:45:56 2024 +0000" }, "committer": { "name": "Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Wed May 29 17:07:22 2024 +0000" }, "message": "Skip to check telephony feature mapping when the SDK version of vendor partition is less thant Android V\n\nBug: 335362916\nTest: manual basic voice call test on ATT\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:58d801208bf72bf54952b3f9d6fafdd9dfa951cb)\nMerged-In: I6f17ad7efa33754a658cdf502400cf4ad3933258\nChange-Id: I6f17ad7efa33754a658cdf502400cf4ad3933258\n" }, { "commit": "88cecddb69b04e7bca9d1c2656b8894aa0b9a9ad", "tree": "93ba3fbcf195829a4690ebd4096c2684415f82e9", "parents": [ "cd310c43ed083eb7347d49dd08f4e937d841d647", "d24233185e1bd542a062a0bfc2c7a1a684f201b5" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:35 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 08 16:30:51 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: I80978aa2be6edabd6a09f22be2c561e1bdb64f78\nChange-Id: Ia0ef3239cebc13632a13676362af3ee88328487c\n" }, { "commit": "4336b37520a82a46bd01d5520ce64fd50a0c456c", "tree": "09f60e88d8bf9e93859078d03d744c43b4923b8c", "parents": [ "da8ad719796443e2349fc0b29729faa6c30c5c39" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Thu Apr 04 00:09:15 2024 +0530" }, "committer": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Fri May 03 04:13:38 2024 +0000" }, "message": "Updated UT cases to use uicc card specific uiccManager instance.\n\nBug: 227236163\nTest: atest ONSTests\nChange-Id: I07a98712e6f2fb3d1ce0a2e5f97693cdfbeb3582\n" }, { "commit": "da8ad719796443e2349fc0b29729faa6c30c5c39", "tree": "1c501a7b055d1a31764e26f79a8e2edf1bf1c755", "parents": [ "04285d7926388197c4e00ec66939b7b6cee1622a" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Mon Nov 07 10:22:31 2022 +0000" }, "committer": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Fri May 03 04:13:04 2024 +0000" }, "message": "Refactor ONS to use EUICC multiple profile APIs\n\nBug: 227236163\nTest: atest ONSTests\nChange-Id: Ifb3e5e5399f6c91838d13374385a8048ed70490f\n" }, { "commit": "04285d7926388197c4e00ec66939b7b6cee1622a", "tree": "daefbfe2a5bd03cd4cc0c4f4a14f17dab24ef293", "parents": [ "42ce4236b4fdae0c9003d896de45f36396489c06" ], "author": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Thu Apr 25 13:58:06 2024 +0000" }, "committer": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Thu Apr 25 13:58:06 2024 +0000" }, "message": "Remove redundant call to SetFlagsRule.initAllFlagsToReleaseConfigDefault()\n\nChange-Id: Ied7dadfe2b8d02bd82c2c483877769d3c12401ac\nTest: atest\nBug: 336802415\nFlag: none\n" }, { "commit": "42ce4236b4fdae0c9003d896de45f36396489c06", "tree": "e4de28811bfd700035ae33cda1d63608678fb1a5", "parents": [ "f938b751a141e21dafa0a09e6c37553a351451ce", "29dc68f7c53b5b06dd65389ca59ab6af43bca81b" ], "author": { "name": "Joonhun Shin", "email": "joonhunshin@google.com", "time": "Tue Apr 23 06:09:06 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 23 06:09:06 2024 +0000" }, "message": "Merge \"Update unit test including vendor API level\" into main" }, { "commit": "f938b751a141e21dafa0a09e6c37553a351451ce", "tree": "f326d08da716c43360aa6dc18e7dc10e47e5975e", "parents": [ "8b56e0b3776ce600bfe703dfa151b3fc32689113", "58d801208bf72bf54952b3f9d6fafdd9dfa951cb" ], "author": { "name": "Joonhun Shin", "email": "joonhunshin@google.com", "time": "Tue Apr 23 06:09:06 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 23 06:09:06 2024 +0000" }, "message": "Merge \"Skip to check telephony feature mapping when the SDK version of vendor partition is less thant Android V\" into main" }, { "commit": "8b56e0b3776ce600bfe703dfa151b3fc32689113", "tree": "4fea5f22c842b68a27a7d7fab03454ff8b9e8805", "parents": [ "680a9868e4e30eb497086c517fda7f65ddffbacf", "cd310c43ed083eb7347d49dd08f4e937d841d647" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 20:37:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 20:37:32 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: dd04e1e7b8 am: cd310c43ed\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2945451\n\nChange-Id: Id381a0942c89ac46334ec34704afb3d9d60c614d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd310c43ed083eb7347d49dd08f4e937d841d647", "tree": "d25119cfe62017c60eb669898a6a3b363135696e", "parents": [ "742668b5cf8cf91748d24cb27a21bc82ca92b91c", "dd04e1e7b871b3149251293c63575d4293422d51" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 20:24:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 22 20:24:58 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main am: dd04e1e7b8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2945451\n\nChange-Id: I02347057d6b039f9869aebb7d5e0a0a5bfd35e7a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd04e1e7b871b3149251293c63575d4293422d51", "tree": "d25119cfe62017c60eb669898a6a3b363135696e", "parents": [ "edca31c142e7b54d29f1328cfb2e2eeacf64749a", "6fecf769c3ff6f4af11b959b19f7b557a0e2e4a3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Apr 22 20:11:09 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Apr 22 20:11:09 2024 +0000" }, "message": "Merge \"Migrate Test Targets to New Android Ownership Model\" into main" }, { "commit": "58d801208bf72bf54952b3f9d6fafdd9dfa951cb", "tree": "90c3eddc201eac23688715035df4b1b3374d9361", "parents": [ "680a9868e4e30eb497086c517fda7f65ddffbacf" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Thu Apr 18 04:45:56 2024 +0000" }, "committer": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Mon Apr 22 07:12:19 2024 +0000" }, "message": "Skip to check telephony feature mapping when the SDK version of vendor partition is less thant Android V\n\nBug: 335362916\nTest: manual basic voice call test on ATT\nChange-Id: I6f17ad7efa33754a658cdf502400cf4ad3933258\n" }, { "commit": "29dc68f7c53b5b06dd65389ca59ab6af43bca81b", "tree": "eea3de282cc85e8c3882fb8a35a1c00f8fdac323", "parents": [ "680a9868e4e30eb497086c517fda7f65ddffbacf" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Thu Apr 18 16:34:26 2024 +0000" }, "committer": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Mon Apr 22 06:50:29 2024 +0000" }, "message": "Update unit test including vendor API level\n\nBug: 335362916\nTest: atest OpportunisticNetworkServiceTest\nChange-Id: Ie13963793b31f26f1306e5043c6c2cf792a2310e\n" }, { "commit": "680a9868e4e30eb497086c517fda7f65ddffbacf", "tree": "5a3d4313af203501be6b5efde94db33de35f99ea", "parents": [ "b4b8f2386ab16dbe17f90cd46db5418dba4df54c" ], "author": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Mar 20 09:50:25 2024 -0700" }, "committer": { "name": "Tomasz Wasilczyk", "email": "twasilczyk@google.com", "time": "Wed Mar 20 09:50:25 2024 -0700" }, "message": "Fix crash when CarrierConfigManager is missing\n\nBug: 330436722\nTest: atest OpportunisticNetworkServiceTest\nTest: ABTD\nChange-Id: Ifd3543f9dddd049764973edafb4f967f33e89ea4\n" }, { "commit": "b4b8f2386ab16dbe17f90cd46db5418dba4df54c", "tree": "2623b0ee907a3f9f2d1e2f8d2b88030b8f7718e2", "parents": [ "d24233185e1bd542a062a0bfc2c7a1a684f201b5", "742668b5cf8cf91748d24cb27a21bc82ca92b91c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:10:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:10:27 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: edca31c142 -s ours am: 742668b5cf -s ours\n\nam skip reason: Merged-In I21d730854f62b3896ee28fd6520ccd9b867eb2f5 with SHA-1 4f5947152b is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2989524\n\nChange-Id: I8f8129cfeac5f2eb1ec87805637da9047ab18a64\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "742668b5cf8cf91748d24cb27a21bc82ca92b91c", "tree": "a65f243f17016fe106d885f33807835871a1c267", "parents": [ "4f5947152b5f788dadb5fa6445b8855c7cadff72", "edca31c142e7b54d29f1328cfb2e2eeacf64749a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 08:33:27 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 08:33:27 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: edca31c142 -s ours\n\nam skip reason: Merged-In I21d730854f62b3896ee28fd6520ccd9b867eb2f5 with SHA-1 4f5947152b is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2989524\n\nChange-Id: I16542f700996897385d7f991627f31a545295050\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "edca31c142e7b54d29f1328cfb2e2eeacf64749a", "tree": "a65f243f17016fe106d885f33807835871a1c267", "parents": [ "4146003c0f7fbe7f43ca8c519b363c1df7c16cdd", "4f5947152b5f788dadb5fa6445b8855c7cadff72" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:11 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:11 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: I21d730854f62b3896ee28fd6520ccd9b867eb2f5\nChange-Id: Idf3ccd1f172b819c0316a54b5478f9626fb061f2\n" }, { "commit": "6fecf769c3ff6f4af11b959b19f7b557a0e2e4a3", "tree": "5ea791258eb5b53b5732ad029dda824c8817ff47", "parents": [ "4146003c0f7fbe7f43ca8c519b363c1df7c16cdd" ], "author": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:57:37 2024 +0000" }, "committer": { "name": "Aditya Choudhary", "email": "caditya@google.com", "time": "Fri Feb 02 13:57:37 2024 +0000" }, "message": "Migrate Test Targets to New Android Ownership Model\n\nThis CL is created as a best effort to migrate test targets to the new Android ownership model.\nIt is based on historical data from repository history and insights from git blame.\nGiven the nature of this effort, there may be instances of incorrect attribution. If you find incorrect or unnecessary\nattribution in this CL, please create a new CL to fix that.\n\nFor detailed guidelines and further information on the migration please refer to the link below,\ngo/new-android-ownership-model\n\nBug: 304529413\nTest: N/A\nChange-Id: Ia3781809bb1a945fa96b01a0b7311a9120dab027\n" }, { "commit": "d24233185e1bd542a062a0bfc2c7a1a684f201b5", "tree": "2623b0ee907a3f9f2d1e2f8d2b88030b8f7718e2", "parents": [ "a986f09baef787881edc0d5a9c04845d168394da", "4f5947152b5f788dadb5fa6445b8855c7cadff72" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:03:37 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:03:37 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 4f5947152b -s ours\n\nam skip reason: Merged-In Iacfad126ff3ffac0427a6ba90b5ca0bd5617ef38 with SHA-1 a625fb2c83 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/25974196\n\nChange-Id: Ie432895dec1b6b3282c72a24ebdcefcd28fc18e4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f5947152b5f788dadb5fa6445b8855c7cadff72", "tree": "a65f243f17016fe106d885f33807835871a1c267", "parents": [ "dc1b3f1d155062beca0b726b5743e4386fe1a7cb", "a625fb2c83cee267a0bcfb58547d0e6febc9428b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:35 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 17 22:14:35 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: Iacfad126ff3ffac0427a6ba90b5ca0bd5617ef38\nChange-Id: I21d730854f62b3896ee28fd6520ccd9b867eb2f5\n" }, { "commit": "a986f09baef787881edc0d5a9c04845d168394da", "tree": "2623b0ee907a3f9f2d1e2f8d2b88030b8f7718e2", "parents": [ "aae690aa20d84411b1d3ea9772e0ba13bbc3c1ee", "460fde2bc10399d6e3a09160022c8e50a04deb5e" ], "author": { "name": "Joonhun Shin", "email": "joonhunshin@google.com", "time": "Thu Jan 11 23:45:30 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 11 23:45:30 2024 +0000" }, "message": "Merge \"Enforce map the telephony features with APIs in OpportunisticNetworkService\" into main" }, { "commit": "aae690aa20d84411b1d3ea9772e0ba13bbc3c1ee", "tree": "a65f243f17016fe106d885f33807835871a1c267", "parents": [ "a625fb2c83cee267a0bcfb58547d0e6febc9428b", "ce74acd4dbb029bd56d142c88be47fb8a1183f9e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 22 10:30:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 22 10:30:16 2023 +0000" }, "message": "Merge \"Make receiver as system user only\" into main am: 4146003c0f am: dc1b3f1d15 am: ce74acd4db\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2855685\n\nChange-Id: I11b98f7ea816730e33380c20abed23bea34db97f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ce74acd4dbb029bd56d142c88be47fb8a1183f9e", "tree": "9770c7f7155a5cf437b3e5dd565e359018d6dc0b", "parents": [ "df38a3557f0e87d216794a4abdab86cdbfd36257", "dc1b3f1d155062beca0b726b5743e4386fe1a7cb" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 22 09:55:41 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 22 09:55:41 2023 +0000" }, "message": "Merge \"Make receiver as system user only\" into main am: 4146003c0f am: dc1b3f1d15\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2855685\n\nChange-Id: Ic93a465110950f786bc1257fc7dec621d5a3f034\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dc1b3f1d155062beca0b726b5743e4386fe1a7cb", "tree": "9770c7f7155a5cf437b3e5dd565e359018d6dc0b", "parents": [ "df38a3557f0e87d216794a4abdab86cdbfd36257", "4146003c0f7fbe7f43ca8c519b363c1df7c16cdd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 22 09:26:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 22 09:26:23 2023 +0000" }, "message": "Merge \"Make receiver as system user only\" into main am: 4146003c0f\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2855685\n\nChange-Id: I405661faa903fa6bf85456c18102f40900a9f923\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4146003c0f7fbe7f43ca8c519b363c1df7c16cdd", "tree": "9770c7f7155a5cf437b3e5dd565e359018d6dc0b", "parents": [ "df38a3557f0e87d216794a4abdab86cdbfd36257", "bddf3537336b939a78273575aa81350d33a6b120" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 22 08:51:52 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 22 08:51:52 2023 +0000" }, "message": "Merge \"Make receiver as system user only\" into main" }, { "commit": "460fde2bc10399d6e3a09160022c8e50a04deb5e", "tree": "89492644a6c92f1a38a1f259c02ca89d9022649b", "parents": [ "a625fb2c83cee267a0bcfb58547d0e6febc9428b" ], "author": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Fri Nov 17 02:38:18 2023 +0000" }, "committer": { "name": "joonhunshin", "email": "joonhunshin@google.com", "time": "Mon Dec 18 11:40:22 2023 +0000" }, "message": "Enforce map the telephony features with APIs in OpportunisticNetworkService\n\nIf the required telephony feature is not defined, throw\nUnsupportedOperationException.\n\nBug: 297989574\nTest: atest ONSTests\nChange-Id: I80978aa2be6edabd6a09f22be2c561e1bdb64f78\n" }, { "commit": "a625fb2c83cee267a0bcfb58547d0e6febc9428b", "tree": "af5988624ed93389b325bfef5f5b027ceef7e811", "parents": [ "adf2c3521dc674991c061135c5dfaa1954748349" ], "author": { "name": "Ling Ma", "email": "linggm@google.com", "time": "Wed Dec 06 17:59:14 2023 -0800" }, "committer": { "name": "Ling Ma", "email": "linggm@google.com", "time": "Wed Dec 06 17:59:14 2023 -0800" }, "message": "Wrap subManager creation with createForAllProfiles\n\nSince U, a sub can be associated to a particular profile, and thus in V we enforce filtering on caller and only show the subs that are associated with the caller.\nHowever, in some cases the caller indeed needs to see all subs regardless its association, e.g. sysUI. Therefore, a param isForAllProfile is added to indicate whether the caller intends to see all subs.\n\nBug: 296076674\nTest: voice call + data browsing\nFlag: ACONFIG com.android.internal.telephony.flags.work_profile_api_split DEVELOPMENT\nChange-Id: Iacfad126ff3ffac0427a6ba90b5ca0bd5617ef38\n" }, { "commit": "bddf3537336b939a78273575aa81350d33a6b120", "tree": "9770c7f7155a5cf437b3e5dd565e359018d6dc0b", "parents": [ "154bca018d0cb2641f4ff6f8ad3454b42bd23b3d" ], "author": { "name": "Ganesh Vilas Chaudhari", "email": "quic_ganeshvi@quicinc.com", "time": "Fri Dec 01 15:38:01 2023 +0530" }, "committer": { "name": "Ganesh Vilas Chaudhari", "email": "quic_ganeshvi@quicinc.com", "time": "Tue Dec 05 05:52:29 2023 +0000" }, "message": "Make receiver as system user only\n\n- ONSAutoBoot receiver receive LOCKED_BOOT_COMPLETED intent and\n start the OpportunisticNetworkService.\n- Avoid receiving LOCKED_BOOT_COMPLETED in guest mode as\n OpportunisticNetworkService is single user and which will not\n start new com.android.phone process\n\nBug: 304206882\nChange-Id: I03afc2ca3fcb9beac10009412d08f31ac6ab5d33\n" }, { "commit": "adf2c3521dc674991c061135c5dfaa1954748349", "tree": "b80ead5a9e479a3ca3f51afbb9789f3777fe2d0d", "parents": [ "37165ab5d9e9934efc3b89e738b998558e11df92", "df38a3557f0e87d216794a4abdab86cdbfd36257" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 20:08:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 20:08:56 2023 +0000" }, "message": "[automerger skipped] Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main am: 154bca018d am: a3e68188a8 am: 5679f37c97 am: 0544a190b9 am: df38a3557f -s ours\n\nam skip reason: Merged-In I8ebd8d4b8cbb6751fd687db361a0aadd0b0d166e with SHA-1 de94b95a00 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159\n\nChange-Id: I5f607e75cf92884b16e5e751c1d5ef73a345624e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "df38a3557f0e87d216794a4abdab86cdbfd36257", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "c1b9240cd377c729b2465e6d7db751a7e16cf90c", "0544a190b9fa98c1e84fa7c139c16cb9d1c0cb82" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 19:37:11 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 19:37:11 2023 +0000" }, "message": "Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main am: 154bca018d am: a3e68188a8 am: 5679f37c97 am: 0544a190b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159\n\nChange-Id: I8e098672e0c5f54e79d14825d0c1219c848b63a1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0544a190b9fa98c1e84fa7c139c16cb9d1c0cb82", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "5eebc468e17ae612e7d9fa2472ad2ef2ab1ec5ec", "5679f37c970e1584adf618ab4d1d544a5524b76a" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 19:03:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 19:03:24 2023 +0000" }, "message": "Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main am: 154bca018d am: a3e68188a8 am: 5679f37c97\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159\n\nChange-Id: Ie8e8317bd5afb4da4825cf312ae80da1f2503088\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5679f37c970e1584adf618ab4d1d544a5524b76a", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "1b80fdaf2d62fc1f4e529696d9fcf8dba43b9fd9", "a3e68188a83db763991f63f674e3792a430e2822" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 18:22:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 18:22:10 2023 +0000" }, "message": "Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main am: 154bca018d am: a3e68188a8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159\n\nChange-Id: I50c2f2c5a5cd631d349ab29443acc98c4220c603\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a3e68188a83db763991f63f674e3792a430e2822", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "93f0d317070da9e67d15811232a4545367a5eb53", "154bca018d0cb2641f4ff6f8ad3454b42bd23b3d" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 17:47:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 10 17:47:49 2023 +0000" }, "message": "Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main am: 154bca018d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2758159\n\nChange-Id: I16bf0a968365d1546274ee0f263d30393aab32d0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "154bca018d0cb2641f4ff6f8ad3454b42bd23b3d", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "f7db52dbabd18a972e08c54e01fe82fb0bf40e1b", "c9b95778cf3551397483d77ab7e86a784093b9f6" ], "author": { "name": "Rambo Wang", "email": "rambowang@google.com", "time": "Tue Oct 10 17:13:27 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 10 17:13:27 2023 +0000" }, "message": "Merge \"AlternativeNetworkAccess: replace CarrierConfigChange broadcast receiverwith new listener API\" into main" }, { "commit": "37165ab5d9e9934efc3b89e738b998558e11df92", "tree": "b80ead5a9e479a3ca3f51afbb9789f3777fe2d0d", "parents": [ "00b13d82bde4f052027373fc2ee62911803902d0", "c1b9240cd377c729b2465e6d7db751a7e16cf90c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:20:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:20:39 2023 +0000" }, "message": "Merge Android 14 am: f7db52dbab am: 93f0d31707 am: 1b80fdaf2d am: 5eebc468e1 am: c1b9240cd3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2776024\n\nChange-Id: I733f48ebd8605bcb60b7fe18e017213da378e63e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c1b9240cd377c729b2465e6d7db751a7e16cf90c", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "4e93530466f36e59fabb63a710662bd1427cd316", "5eebc468e17ae612e7d9fa2472ad2ef2ab1ec5ec" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:01:08 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:01:08 2023 +0000" }, "message": "Merge Android 14 am: f7db52dbab am: 93f0d31707 am: 1b80fdaf2d am: 5eebc468e1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2776024\n\nChange-Id: I06165227e2b93d03fac194fb6781fd50017335aa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5eebc468e17ae612e7d9fa2472ad2ef2ab1ec5ec", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "349fb1273e88006d34cc719a2f0f9c1761843214", "1b80fdaf2d62fc1f4e529696d9fcf8dba43b9fd9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:51:18 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:51:18 2023 +0000" }, "message": "Merge Android 14 am: f7db52dbab am: 93f0d31707 am: 1b80fdaf2d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2776024\n\nChange-Id: I964a40e4ecad0b2dbe8b0ca8cb5a6b3f72153cac\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1b80fdaf2d62fc1f4e529696d9fcf8dba43b9fd9", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "52cc9473d1f3511dcca241fcd3fc2d47b706015b", "93f0d317070da9e67d15811232a4545367a5eb53" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:59:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:59:39 2023 +0000" }, "message": "Merge Android 14 am: f7db52dbab am: 93f0d31707\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2776024\n\nChange-Id: Ic46a2119f77cc8feb8dcae4c01011098dfe462f3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "93f0d317070da9e67d15811232a4545367a5eb53", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "35c9ec7234001fad142e81414fb80947c89d9488", "f7db52dbabd18a972e08c54e01fe82fb0bf40e1b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:52:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:52:38 2023 +0000" }, "message": "Merge Android 14 am: f7db52dbab\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2776024\n\nChange-Id: Ib7f65b1b30b9330841f77c31748d34014c8c72a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f7db52dbabd18a972e08c54e01fe82fb0bf40e1b", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "47576bd165d192a11eabe18ff589d507402909fe", "35c9ec7234001fad142e81414fb80947c89d9488" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:57 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:57 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: I53d91acc76dc65689eb8738d5d56b1b24fc466a6\nI4829d4a25fc43857d134447e9e1f43bb9c84729e\nChange-Id: Iefb47bde1f9949d300c5345cad37fff0809e9d8d\n" }, { "commit": "c9b95778cf3551397483d77ab7e86a784093b9f6", "tree": "95c3123cfaa630b7094fce00901fffb57f83962d", "parents": [ "47576bd165d192a11eabe18ff589d507402909fe" ], "author": { "name": "Sungcheol Ahn", "email": "@google.com", "time": "Mon Sep 25 18:33:13 2023 +0000" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Mon Sep 25 18:33:13 2023 +0000" }, "message": "AlternativeNetworkAccess: replace CarrierConfigChange broadcast\nreceiverwith new listener API\n\nBug: 264917992\nTest: Manual test with direct boot, lock pattern or PIN lock/unlock,SIM remove/insert,etc\nTest: atest OpportunisticNetworkServiceTest\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de94b95a009647637b20e7436ec89999480c8f05)\nMerged-In: I8ebd8d4b8cbb6751fd687db361a0aadd0b0d166e\nChange-Id: I8ebd8d4b8cbb6751fd687db361a0aadd0b0d166e\n" }, { "commit": "00b13d82bde4f052027373fc2ee62911803902d0", "tree": "b80ead5a9e479a3ca3f51afbb9789f3777fe2d0d", "parents": [ "b8757d6b0abe5224232dc6e21ddafbac93ceea48", "4e93530466f36e59fabb63a710662bd1427cd316" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:25:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:25:48 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 35c9ec7234 -s ours am: 52cc9473d1 -s ours am: 349fb1273e -s ours am: 4e93530466 -s ours\n\nam skip reason: Merged-In I4829d4a25fc43857d134447e9e1f43bb9c84729e with SHA-1 cdbd29aa0b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/24182944\n\nChange-Id: I959f3b6ab7aad0d504185b8b25a0384b07cc8303\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e93530466f36e59fabb63a710662bd1427cd316", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "b8510d79bcb4e2bcd509a5bc0b183e17933ba2ee", "349fb1273e88006d34cc719a2f0f9c1761843214" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:31:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:31:17 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 35c9ec7234 -s ours am: 52cc9473d1 -s ours am: 349fb1273e -s ours\n\nam skip reason: Merged-In I4829d4a25fc43857d134447e9e1f43bb9c84729e with SHA-1 cdbd29aa0b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/24182944\n\nChange-Id: I9e25a910bc9df72bd7febff5e3dba940d5836039\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "349fb1273e88006d34cc719a2f0f9c1761843214", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "b8510d79bcb4e2bcd509a5bc0b183e17933ba2ee", "52cc9473d1f3511dcca241fcd3fc2d47b706015b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 22:56:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 22:56:43 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 35c9ec7234 -s ours am: 52cc9473d1 -s ours\n\nam skip reason: Merged-In I4829d4a25fc43857d134447e9e1f43bb9c84729e with SHA-1 cdbd29aa0b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/24182944\n\nChange-Id: I4edc43d799739529286ff286dd6adde5b9a70a04\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "52cc9473d1f3511dcca241fcd3fc2d47b706015b", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965", "35c9ec7234001fad142e81414fb80947c89d9488" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 22:15:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 22:15:51 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 35c9ec7234 -s ours\n\nam skip reason: Merged-In I4829d4a25fc43857d134447e9e1f43bb9c84729e with SHA-1 cdbd29aa0b is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/24182944\n\nChange-Id: Ieadb183546831f5c558ff3f658cfd8c8691836ba\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b8757d6b0abe5224232dc6e21ddafbac93ceea48", "tree": "b80ead5a9e479a3ca3f51afbb9789f3777fe2d0d", "parents": [ "de94b95a009647637b20e7436ec89999480c8f05" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Fri Aug 18 10:43:48 2023 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Aug 22 19:35:54 2023 +0000" }, "message": "Add safety to complement a fix in SubMan\n\nSubscriptionManager will now throw an exception in the event\nthat a subscription group cannot be created, in accordance with\nthe API contract. To avoid any possible regression do a\ntry/catch in this code to preserve the old behavior in this code.\n\nBug: 296125268\nTest: atest FrameworksTelephonyTests\nTest: MO/MT voice call, MO/MT sms, data\nChange-Id: I29bce09d513f7f7eb54fdd05a1168eee1c735a90\n" }, { "commit": "35c9ec7234001fad142e81414fb80947c89d9488", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "47576bd165d192a11eabe18ff589d507402909fe", "cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:43:23 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:43:23 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: I4829d4a25fc43857d134447e9e1f43bb9c84729e\nChange-Id: I6dd4f600113472084343cd13f7c6b00bdd01b473\n" }, { "commit": "de94b95a009647637b20e7436ec89999480c8f05", "tree": "c3c55a7c3284683b23a3e3392ace06db561f8a5c", "parents": [ "7c4f7e4a35b10ff39eeacead833dba9725fdad8c" ], "author": { "name": "Sungcheol Ahn", "email": "@google.com", "time": "Thu Jun 29 07:04:58 2023 +0000" }, "committer": { "name": "Sungcheol Ahn", "email": "donaldahn@google.com", "time": "Thu Jul 13 22:39:28 2023 +0000" }, "message": "AlternativeNetworkAccess: replace CarrierConfigChange broadcast\nreceiverwith new listener API\n\nBug: 264917992\nTest: Manual test with direct boot, lock pattern or PIN lock/unlock,SIM remove/insert,etc\nTest: atest OpportunisticNetworkServiceTest\n\nChange-Id: I8ebd8d4b8cbb6751fd687db361a0aadd0b0d166e\n" }, { "commit": "7c4f7e4a35b10ff39eeacead833dba9725fdad8c", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "055e1f798d033b070e06b051175dc2cefd8876a4", "b8510d79bcb4e2bcd509a5bc0b183e17933ba2ee" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 22:39:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 22:39:48 2023 +0000" }, "message": "Allow Carrier Privs on Any Sub for SubId Check am: cdbd29aa0b am: b8510d79bc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/22716776\n\nChange-Id: I31d1a0fa37ccfce41a35b33978d60b62108606f2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "055e1f798d033b070e06b051175dc2cefd8876a4", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "16b1ec7f3ddc65afc0efbefcda284e8f06b06b62", "8eaedf7cc2d20d4f81a967c6a4af12aec1bfff7e" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 22:38:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 22:38:01 2023 +0000" }, "message": "Allow Carrier Privs on Any Sub for SubId Check am: cdbd29aa0b am: 8eaedf7cc2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/22716776\n\nChange-Id: I9b2d17d2b6af8f4d007f9205a2679fbb0efd6dc2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b8510d79bcb4e2bcd509a5bc0b183e17933ba2ee", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "39d80a30806168ac3f5eb0e3986988b9196c0e29", "cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 21:57:55 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 21:57:55 2023 +0000" }, "message": "Allow Carrier Privs on Any Sub for SubId Check am: cdbd29aa0b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/22716776\n\nChange-Id: I0018daf7ff398cc40fc83248d8b1e9316043c43a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8eaedf7cc2d20d4f81a967c6a4af12aec1bfff7e", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "8dfea8e36ec8badfd24f2d87a844e8618f14c8fb", "cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 21:57:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 18 21:57:51 2023 +0000" }, "message": "Allow Carrier Privs on Any Sub for SubId Check am: cdbd29aa0b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/22716776\n\nChange-Id: Id6a6b303ac6fab9fa190213e3b91e3191ce2a87b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cdbd29aa0b32c5d79eb342b2f46d2fe47cc2a965", "tree": "6ab377c21a9227c077fe7707c570cc95a6f93968", "parents": [ "90ef9db71f585b123d5a32c6d7ad85e9b07e0455" ], "author": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 11:26:58 2023 -0700" }, "committer": { "name": "Nathan Harold", "email": "nharold@google.com", "time": "Tue Apr 18 11:54:03 2023 -0700" }, "message": "Allow Carrier Privs on Any Sub for SubId Check\n\nThe ONS method to get the preferred Opportunistic\nData Subscription, like other Subscription methods,\nis not subscription-specific. The permissions check\ninside that method required carrier privileges on the\n*default* subscription, which is incorrect in two ways.\nFirst, the default subId is the \"voice\" subId on\nvoice-capable phones. Secondly, getting a subId is not\nsenstive, and so READ_PHONE_STATE on any subscription\nis fine, regardless of whether that subscription is the\ndefault for any specific service.\n\nThe net change is to allow carrier privilege check to pass\non ANY sub rather than just the DEFAULT (voice) sub.\n\nBug: 273568571\nTest: atest\nCarrierApiTest#testUpdateAvailableNetworksWithCarrierPrivilege\nTest: atest TelephonyManagerReadPhoneStatePermissionTest\nTest: atest\nOpportunisticNetworkServiceTest#testGetPreferredDataSubscriptionId\nChange-Id: I53d91acc76dc65689eb8738d5d56b1b24fc466a6\n\nChange-Id: I4829d4a25fc43857d134447e9e1f43bb9c84729e\n" }, { "commit": "16b1ec7f3ddc65afc0efbefcda284e8f06b06b62", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "f6ce8fb40f0ca8dfea8be04014a2d89d4252ad95", "8dfea8e36ec8badfd24f2d87a844e8618f14c8fb" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Feb 28 22:33:43 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 28 22:33:43 2023 +0000" }, "message": "Revert \"Replace CarrierConfigChange broadcast receiver with new listener API.\" am: 90ef9db71f am: 8dfea8e36e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21648762\n\nChange-Id: Id7ade53abe8198d64b591db6bb74fec77c7696c3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f6ce8fb40f0ca8dfea8be04014a2d89d4252ad95", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "901022a15e5ea0948f6a3d37312e64c011769791", "39d80a30806168ac3f5eb0e3986988b9196c0e29" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Feb 28 22:25:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 28 22:25:17 2023 +0000" }, "message": "Revert \"Replace CarrierConfigChange broadcast receiver with new listener API.\" am: 90ef9db71f am: 39d80a3080\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21648762\n\nChange-Id: I09c7a57bf568940f08cb29586b5063844a62dcc4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8dfea8e36ec8badfd24f2d87a844e8618f14c8fb", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "5f08dcb1326e11b33c7107a4e53c929dad07afb5", "90ef9db71f585b123d5a32c6d7ad85e9b07e0455" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Feb 28 21:46:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 28 21:46:40 2023 +0000" }, "message": "Revert \"Replace CarrierConfigChange broadcast receiver with new listener API.\" am: 90ef9db71f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21648762\n\nChange-Id: Ifebdb86ffa3494b773f4206e3e2f94ab99b114c0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "39d80a30806168ac3f5eb0e3986988b9196c0e29", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "701b1333b7d7d933ff057b0460b84226ec9b0284", "90ef9db71f585b123d5a32c6d7ad85e9b07e0455" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Feb 28 21:40:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 28 21:40:23 2023 +0000" }, "message": "Revert \"Replace CarrierConfigChange broadcast receiver with new listener API.\" am: 90ef9db71f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21648762\n\nChange-Id: Ib9951a356b7e9672f6bbd71959c53f2e72d77736\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "90ef9db71f585b123d5a32c6d7ad85e9b07e0455", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "0df9fa39d3ae44091bea9a9964e58c608a575afb" ], "author": { "name": "Jack Yu", "email": "jackyu@google.com", "time": "Tue Feb 28 17:34:31 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 28 17:34:31 2023 +0000" }, "message": "Revert \"Replace CarrierConfigChange broadcast receiver with new listener API.\"\n\nThis reverts commit 0df9fa39d3ae44091bea9a9964e58c608a575afb.\n\nReason for revert: b/271105533\n\nChange-Id: Ida896e68ea9b5a2460ac5db56b95e5b13ad71c08\n" }, { "commit": "901022a15e5ea0948f6a3d37312e64c011769791", "tree": "a18049efc80d9278dadae386fd1c9ade51b953fe", "parents": [ "98fe7e595bd157b9c2b0605c780d4d9719782eaa", "5f08dcb1326e11b33c7107a4e53c929dad07afb5" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Sun Feb 26 03:04:00 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 26 03:04:00 2023 +0000" }, "message": "Replace CarrierConfigChange broadcast receiver with new listener API. am: 0df9fa39d3 am: 5f08dcb132\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21556521\n\nChange-Id: I3a8a7838828c10ff6532f41a2d8aa2507bf64bfa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "98fe7e595bd157b9c2b0605c780d4d9719782eaa", "tree": "a18049efc80d9278dadae386fd1c9ade51b953fe", "parents": [ "901e86e07b5efe458a4b1e3921f6d2ff0a362771", "701b1333b7d7d933ff057b0460b84226ec9b0284" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Sun Feb 26 03:02:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 26 03:02:50 2023 +0000" }, "message": "Replace CarrierConfigChange broadcast receiver with new listener API. am: 0df9fa39d3 am: 701b1333b7\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21556521\n\nChange-Id: I96de350e720b89ade1f402ba83a1cb449edaa8a7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "701b1333b7d7d933ff057b0460b84226ec9b0284", "tree": "a18049efc80d9278dadae386fd1c9ade51b953fe", "parents": [ "901e86e07b5efe458a4b1e3921f6d2ff0a362771", "0df9fa39d3ae44091bea9a9964e58c608a575afb" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Sun Feb 26 02:30:24 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 26 02:30:24 2023 +0000" }, "message": "Replace CarrierConfigChange broadcast receiver with new listener API. am: 0df9fa39d3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21556521\n\nChange-Id: I26f5d136a271e5d90cddcce721de95f5abbd18f7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5f08dcb1326e11b33c7107a4e53c929dad07afb5", "tree": "a18049efc80d9278dadae386fd1c9ade51b953fe", "parents": [ "901e86e07b5efe458a4b1e3921f6d2ff0a362771", "0df9fa39d3ae44091bea9a9964e58c608a575afb" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Sun Feb 26 02:30:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Feb 26 02:30:16 2023 +0000" }, "message": "Replace CarrierConfigChange broadcast receiver with new listener API. am: 0df9fa39d3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/21556521\n\nChange-Id: I6364ff615539c66de96abb9f4a0f09fa274cbc7e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0df9fa39d3ae44091bea9a9964e58c608a575afb", "tree": "a18049efc80d9278dadae386fd1c9ade51b953fe", "parents": [ "901e86e07b5efe458a4b1e3921f6d2ff0a362771" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Thu Feb 23 10:53:38 2023 +0000" }, "committer": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Thu Feb 23 10:55:33 2023 +0000" }, "message": "Replace CarrierConfigChange broadcast receiver with new listener API.\n\nBug: 264917992\nTest: Manually tested by log verification\nChange-Id: I63f249f0d15113de39f4aeb33752b6f7699d9958\n" }, { "commit": "901e86e07b5efe458a4b1e3921f6d2ff0a362771", "tree": "49c49f483b7073ad9076ec38332d196de3dd874d", "parents": [ "2684834e705b29708ea4440db5a677f65e2ee4ed" ], "author": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Tue Dec 20 18:27:58 2022 +0000" }, "committer": { "name": "Avinash Malipatil", "email": "avinashmp@google.com", "time": "Fri Jan 13 04:44:35 2023 +0000" }, "message": "Fetch all the subscriptions and handle null return.\n\nBug: 263143310\nTest: atest ONSTests, System testing.\nChange-Id: Ib09b59ae861c74c5ac9bbc0073cb77c430af0735\n" }, { "commit": "2684834e705b29708ea4440db5a677f65e2ee4ed", "tree": "6bc5913b7dff0b154d066b4765b48fd4bcbdd457", "parents": [ "826d92fe22ee6bb7cce4a3fce5c18e2935537add", "47576bd165d192a11eabe18ff589d507402909fe" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 12 13:50:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 12 13:50:45 2022 +0000" }, "message": "Merge \"[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours\" into stage-aosp-master am: 05a4615d66 -s ours am: 47576bd165 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: Id2e0a7e7833e4dc84354c8c87a287347ec6e8aad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "826d92fe22ee6bb7cce4a3fce5c18e2935537add", "tree": "6bc5913b7dff0b154d066b4765b48fd4bcbdd457", "parents": [ "1f451e042481b48b755657225fc0f5b99f246239", "c78e8a16111f8c20593cd60be030c06d815a553a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 12 13:48:01 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 12 13:48:01 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours am: c89aa0cd76 -s ours am: c78e8a1611 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: I525479b799db4978f249d7529d264386d732aef7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1f451e042481b48b755657225fc0f5b99f246239", "tree": "6bc5913b7dff0b154d066b4765b48fd4bcbdd457", "parents": [ "82c336eb88643c4a3df1b0f7ffc392ab39c69d35", "312b93d619d4e1d19911826931052f536acfb190" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 12 11:57:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 12 11:57:08 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours am: 85db0418ec -s ours am: 312b93d619 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: Ic35664cca9e41be1fa2b20b8eb608a4f1ad1387f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "47576bd165d192a11eabe18ff589d507402909fe", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "c78e8a16111f8c20593cd60be030c06d815a553a", "05a4615d6690ef95c3ff68a6cf4fe60b962bca49" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 10 02:00:18 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 10 02:00:18 2022 +0000" }, "message": "Merge \"[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours\" into stage-aosp-master am: 05a4615d66 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: Ic80158f2212a46a270538b9388f495f351046bc9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c78e8a16111f8c20593cd60be030c06d815a553a", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "312b93d619d4e1d19911826931052f536acfb190", "c89aa0cd76394e5e6e7dfdf98a47c892abfa085e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Dec 10 01:57:34 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 10 01:57:34 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours am: c89aa0cd76 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: I96a3a138b4822b043f37bc4ec3c85d60d7bdab41\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "312b93d619d4e1d19911826931052f536acfb190", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "c9ab9ace4915852b99c47705cc6e20afc0fa3d36", "85db0418ecc5ff8fd6f5b0911829041cf1dbd1e0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Dec 10 00:24:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 10 00:24:55 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours am: 85db0418ec -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: I8c7ace2acdf6bf0b6ff588528ff425a10d7ceb09\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05a4615d6690ef95c3ff68a6cf4fe60b962bca49", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "85db0418ecc5ff8fd6f5b0911829041cf1dbd1e0", "c89aa0cd76394e5e6e7dfdf98a47c892abfa085e" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 23:32:16 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 09 23:32:16 2022 +0000" }, "message": "Merge \"[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours\" into stage-aosp-master" }, { "commit": "c89aa0cd76394e5e6e7dfdf98a47c892abfa085e", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "3f40281c754cffd0be9bee3bad966324fea9a332", "d74119fba8ae3453cf7f5baaaef02554daf55d6b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 09 23:19:33 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 23:19:33 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: Iff5e034acf0822083846b57e187182a3d9a90b01\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "85db0418ecc5ff8fd6f5b0911829041cf1dbd1e0", "tree": "5a3f2ae3511b62367d9d2caabc46eebf95641855", "parents": [ "3f40281c754cffd0be9bee3bad966324fea9a332", "d74119fba8ae3453cf7f5baaaef02554daf55d6b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 09 23:14:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 09 23:14:49 2022 +0000" }, "message": "[automerger skipped] Merge Android 13 QPR1 am: d74119fba8 -s ours\n\nam skip reason: Merged-In I23da5c69fc92623545d8663f6e0c93106abc6d5c with SHA-1 e723013186 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2338073\n\nChange-Id: I79ea43b92df08434d6e534aa546f8304d5c80070\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "d74119fba8ae3453cf7f5baaaef02554daf55d6b" }