summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-21Snap for 8857176 from 5c7f06a2ee4e6fac8be2c7cb3274294e83a94291 to ↵aml_go_mpr_330912000android13-mainline-go-mediaprovider-releaseAndroid Build Coastguard Worker
mainline-go-mediaprovider-release Change-Id: I2949f50e37fe56436c5de7269d91caf9a2c0876e
2022-07-20Merge "Add benchmarks for WASM bidding logic" into tm-mainline-prodTreeHugger Robot
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I36ee554be29859b3a28ef6030957dd3799f7317f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am: 1217209edf -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I52571d80f8ca2388c9e433460f89e7356ceeb95f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I5494e1bc1e6225d8b9cddb5cf69c12b9f574765c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: 650e883ff7 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I8f6a92dec20c6b43fab14e7ca11403b30f6e1c82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: Iba2292a2af14bc8b9588462d91e35571b971fd13 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I69154f34c47b8454f474a8fbbd2764e3db135d01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I8ff40caac4ba3cdd7b4f566153992892d64439c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: Ib5e63c6277a7538ba41c9ff2c3517fe016e43deb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: Ia6b5324d8af914029711c1fb63af6b45d5f2b217 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Stop crashing the system on hitting the alarm limit am: ↵Suprabh Shukla
c010da3a46 am: ee9331c0d3 -s ours am skip reason: skipped by user suprabh Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I06963a3201ef81c1fe537bab7a1d51f1e305a924 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Stop crashing the system on hitting the alarm limit am: c010da3a46Suprabh Shukla
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069 Change-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Merge changes Ie8ddf1db,Ice6de114 into tm-dev am: edb497c9bfSteve Elliott
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065708 Change-Id: Ie846587380f7fd4047aa5cfcc8cd62703231c262 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Fix squished notifications on the lockscreen. am: c29777f405Jeff DeCew
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19065229 Change-Id: Ib957a0c61c985d428e6ae3355dcdfb5c19cec55f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Merge changes Ie8ddf1db,Ice6de114 into tm-devSteve Elliott
* changes: Fix stale NSSL "fling" state caused by no-op fling Fix squished notifications on the lockscreen.
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am: 6e4bd6d0e0 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I52c208d316c50adeda82e15b36e85ecddad874f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am: f5b9c814e1 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I22d2d245369134d0649bf16357825ad5921435b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am: b23fac6739 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I6d3d37f588a85ce85e032415c1272d29c76138ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours am: c41f714122 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I816cc52b9ab5e143b34036d84fdb48ac6c7c48c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] [automerge] Stop crashing the system on hitting the ↵Suprabh Shukla
alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am: 2dac8d1d85 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: Ica3af700b0a070bf13e192dc1f9a98b2c5eb1345 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am: 98f625151c -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I40b0eccf9029f30ceb64c15b937c9e776300c299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-qpr1-dev am: 950fb419e7 am: e41a97f229 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I6258a64e1367d003827c74bf9ac889d49455fee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Stop crashing the system on hitting the alarm limitSuprabh Shukla
Exempting the system as a runtime restart is not clearly better than extreme memory and computation pressure that can result from the originating spam. Callers in the system should guard against any spammy requests that lead them to create a lot of alarms. Test: Builds, boots and existing tests should pass. atest CtsAlarmManagerTestCases:UidCapTests atest FrameworksMockingServicesTests:AlarmManagerServiceTest Bug: 234441463 Change-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff (cherry picked from commit 3b9f3f4a0f5a661be65e287996cae8a4481a1453) Merged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am: 4792391ce3 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: Id1a1fa141e74b44a8d44567d2764975e0a4a5246 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am: 88e1f760bf -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I7db1b53b317189cb337f978b6b5ad7b536dec456 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge changes from topic ↵TreeHugger Robot
"presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb7f -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I1fbe88d540518c9f9c22583841ba3f5e5d552140 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" ↵TreeHugger Robot
into sc-qpr1-dev am: 950fb419e7 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: Ib3093d84642819dbbdad51427ca5588bed584707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] [automerge] Stop crashing the system on hitting the ↵Suprabh Shukla
alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I0ec59ec496077a2f3a90bab31b57b4205ddb83cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: Id0099210f887930c7365b7d9c005bce834c63dc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20[automerger skipped] Merge "Stop crashing the system on hitting the alarm ↵TreeHugger Robot
limit" into sc-dev am: 8b2f5cecd1 -s ours am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 87fd506129 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495 Change-Id: I8e940e45fce652bffb14a78eb49116cd6558d8d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20Merge "Stop crashing the system on hitting the alarm limit" into sc-devTreeHugger Robot
2022-07-20Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" ↵TreeHugger Robot
into sc-mainline-prod * changes: [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 Stop crashing the system on hitting the alarm limit
2022-07-20Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" ↵TreeHugger Robot
into sc-qpr1-dev * changes: [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 Stop crashing the system on hitting the alarm limit
2022-07-20Fix stale NSSL "fling" state caused by no-op flingSteve Elliott
If a fling gesture ends with the current Y position in the exact end position for the fling, then the code to run the fling animation is bypassed, but the flag in AmbientState tracking whether a fling is active is never reset. This CL replaces the short circuit logic with the standard fling-end logic, ensuring that all expected code paths are executed. Fixes: 234824085 Fixes: 237272856 Test: manual 1. Enter lockscreen 2. Swipe up and then down to the exact same position, in one continuous gesture 3. Wait for a notification update Observe: Shade resizes correctly to match the new contents Change-Id: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 Merged-In: Ie8ddf1dbaaf1ba607657646db05d3eb622fc9415 (cherry picked from commit 7f387f9ae92490d7ab196eb2274019b543b8ab88)
2022-07-19Add dependency on collector-device-lib-platform, which includes statsd ↵Neil Vohra
metric collectors Test: Presubmits Bug: b/231969600 Change-Id: I88da7288d83430d938a1fbbd87a45c3e1b5d53d7
2022-07-19Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-dev ↵TreeHugger Robot
am: 58dc8eb63b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19272069 Change-Id: I974a03ebab1d6841e0ff15893d1115e75895dae9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19Merge "Correct the range of issueOfDataEphemeris as [0, 1023]" into tm-devTreeHugger Robot
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am: e1205e536a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: Icd184199842cf7f505817b8fc89aa3d98dfd9eb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am: 59f1e6a43a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: Ica7763a14479ccee324c444101923987e98239ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am: 3f0d1a7985 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: Ibf65c84182fee357dd9006132b730ac2f9076317 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: ccdd838e56 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: Ide91e3717d511305836a4499a8f5505f1a88add2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am: d1e53dc1dc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: I49e64f9c1f5a156495fb077259151eac2f16ae02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: I1372460abd6e6c5221b363cd8ac78564ef2726b7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am: fd03677090 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: I585e5537ec4c68d663005f9ea696c3991b8dba3b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am: 9b119e761f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: I70e6f3db876f3db30e9431ff491360636b01c622 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] Merge "Revert "Revert "Limit the number of concurrently ↵Julia Reynolds
snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 48b83a0025 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341499 Change-Id: I2d204aa6937762eee74a5fc194e58a0777488121 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] Revert "Revert "Limit the number of concurrently ↵Julia Reynolds
snoozed notifications"" am: e2ceb6acfa -s ours am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 48b83a0025 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19341499 Change-Id: I5608287b2c7d37d000492fbf225217ea02287a68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19[automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed ↵Julia Reynolds
notifications am: c38cc3e355 am: c1d1396751 -s ours am: a6d920e3d6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944 Change-Id: I7ad62b910b3ab3344c423c6b9f7e4a1c21c0c744 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19Merge "Revert "Revert "Limit the number of concurrently snoozed ↵Julia Reynolds
notifications""" into tm-dev
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:16:57 +0000