Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
789,922 Commits 3 Branches 0 Tags
24a824156fe4e5f7350da198643fa2cfedcd2eda
Commit Graph

789922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Chant
d05a677f99 Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: 8dc1ff7f7f am: 3d3bb44a6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: Ie6e38cf5711e8c01a15d14a1da90be1672731000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:16:26 +00:00
Automerger Merge Worker
fed688b094 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours" into tm-d1-dev-plus-aosp am: 64e3b56d44 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Ie8c5ac9a71525618620eea8e83b803b787b8e73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:16:17 +00:00
Julia Reynolds
6905cf8731 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours am: 3b16e86b37 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Id5594b90c88747ae6673ed5ffd803cb237ad218a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:16:12 +00:00
TreeHugger Robot
3ca7a5ab25 Merge "Prevent displays that are disabled from receiving input" into tm-qpr-dev 2022-07-19 19:15:40 +00:00
Andrew Chant
6b68389892 Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: d70d126558 am: eff17a6b47 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: Ic950c8d8b6077045d16296ca84e49f1ffaf2f5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:15:23 +00:00
Automerger Merge Worker
8ed9dcc5e8 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours" into tm-d1-dev-plus-aosp am: b29c165073 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: Iebe93bd709b5996723634ea92d0045602509d851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:14:57 +00:00
Julia Reynolds
fc40c79f6e [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours am: 78ca839503 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I095ec42175e53452728b129ee20bcb23537e591d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:14:30 +00:00
Julia Reynolds
ff0cefea1f [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: c16fad2381 -s ours am: 783475f61a -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I356668c8b3598a1139c3634939f78de88e544b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:14:07 +00:00
Julia Reynolds
a0f7f0d159 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: 435ee3eb75 -s ours am: b904a4b00d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I3bca1dd6b03793ac78f96b5479b727512cbca2ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:13:56 +00:00
Automerger Merge Worker
bec1cfb0b0 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours" into tm-d1-dev-plus-aosp am: cdcc9a23b5 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I1cd2ad5aa14b2067747287503e1719bfdaacde6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:13:44 +00:00
Julia Reynolds
1fb88ea40d [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours am: 4fe1289d05 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Ibf7e101c0e74eeff8d695c867917ece9c7cc9590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:13:35 +00:00
Julia Reynolds
e6d23f6382 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: c49d4cd750 -s ours am: c4819d07ee -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I3a9e38a7b9ccb6af8e0682850c42fb21f4bb3fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:12:40 +00:00
Automerger Merge Worker
5b53836930 Merge changes from topic "am-e88a4e75a6a14472ad8ea35e4b6d17c7" into tm-qpr-dev-plus-aosp 
* changes:
  Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours" into tm-d1-dev-plus-aosp am: 95c26b78fe -s ours
  [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours am: 3123c5cf36 -s ours
 2022-07-19 19:12:35 +00:00
Jeff Sharkey
954431c4df Merge changes from topic "jul15" am: 0e27faa039 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: Ie949e0bb40967581190f7b98bb5005bab19cb7fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:12:28 +00:00
Automerger Merge Worker
7f7558a0b7 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours" into tm-d1-dev-plus-aosp am: 95c26b78fe -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7c38394ae9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: Idbb4bca5a63820953b6f3e9f760bf4269f606196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:12:27 +00:00
Julia Reynolds
6ba951b05c [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours am: 3123c5cf36 -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/+/19205942

Change-Id: Ica010b61df6c8b817afee4fb0ea76710b6343bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:12:21 +00:00
TreeHugger Robot
7d25437cb4 Merge changes from topic "ccassidy-sbil" into tm-qpr-dev am: 758b4a3eb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105570

Change-Id: I08bc2e8185f59432d8e4018753821bd25c8d32d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:12:06 +00:00
Alex Buynytskyy
574659e3dd [automerger skipped] Cache least recently used output buffer. am: 2be5b4c118 -s ours 
am skip reason: Merged-In Ieedd27a676d718967c2fac30bc48a68ae636a180 with SHA-1 19f8adfbdf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155658

Change-Id: Ic0bf76701c2ea6dd6aea6ced9f4f3d8340f6066d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:11:56 +00:00
Caitlin Cassidy
bc49c38342 [Status Bar Refactor] Move StatusBarIconListTest to the same directory am: 241a687a35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117577

Change-Id: Ic0fccd53d6f2e3d5978978015e68184a8b35841a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:11:50 +00:00
Julia Reynolds
d63af7dfb4 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: eae4f6b506 -s ours am: fa436a1fa1 -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/+/19205942

Change-Id: I1556ea0c19cb9ee46b099f06027c26a4328370e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:11:19 +00:00
Andrew Chant
d1a7f4f7db Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: 8dc1ff7f7f am: 6fd764213e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: I6d7e4266ced1c4be5caf6f11f8b947493f33325e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:10:30 +00:00
Julia Reynolds
6803975cac [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours am: 8592cef8b3 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Ib9c1980c989bfa5ac5d38a6d35442c2f567877c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:10:18 +00:00
Julia Reynolds
fd12b79a0a [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours am: b583e1c49d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I4649abe884aee73a34a9bb94778d6dc4e7332191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:09:50 +00:00
Julia Reynolds
ed644927ab [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours am: 93fa0be217 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I193f80a431412bbecdd43a698e00a494cb789028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:09:22 +00:00
Julia Reynolds
92ccc08752 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours am: 93380329a6 -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/+/19205942

Change-Id: Ie1bb01cb00cf372a065de554147509b82f1f3aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:08:59 +00:00
TreeHugger Robot
758b4a3eb9 Merge changes from topic "ccassidy-sbil" into tm-qpr-dev 
* changes:
  [Status Bar Refactor] Improvements to StatusBarIconList:
  [Status Bar Refactor] Move StatusBarIconListTest to the same directory as StatusBarIconList.
 2022-07-19 19:04:26 +00:00
Jeff Sharkey
0e27faa039 Merge changes from topic "jul15" 
* changes:
  Offer explicit 3-byte vs 4-byte modified UTF-8.
  Cache least recently used output buffer.
 2022-07-19 18:59:31 +00:00
Automerger Merge Worker
bd3906c2c4 Merge "Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89ed am: 6d338ccf26 am: acdb443af1" into tm-d1-dev-plus-aosp 2022-07-19 18:51:59 +00:00
Patrick Rohr
2180d04a5c Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89ed am: 6d338ccf26 am: acdb443af1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152437

Change-Id: I20bfd489f3d0031291837a7b10aff070390eeb10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:51:35 +00:00
Andrew Chant
3d3bb44a6f Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: 8dc1ff7f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: I020b298c86fecd6df7d9e72181f56d9c62e2d0e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:51:22 +00:00
Automerger Merge Worker
64e3b56d44 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours" into tm-d1-dev-plus-aosp 2022-07-19 18:51:16 +00:00
Andrew Chant
6fd764213e Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: 8dc1ff7f7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: Ie0acc0749cf938208ce7ceb544956ea6e5c98346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:51:02 +00:00
Julia Reynolds
3b16e86b37 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I1931304f6f78cdf0c608d9fdc751ee5dfd0b8a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:54 +00:00
Andrew Chant
eff17a6b47 Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793f0 am: d70d126558 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19340631

Change-Id: Id4a25fa50f83ee99e19e9c73f9e087be8eb60f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:52 +00:00
Julia Reynolds
8592cef8b3 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: f0b270614f -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I196d44940cd8e7fc946a943bdd7f1bc98259f46a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:51 +00:00
Automerger Merge Worker
b29c165073 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours" into tm-d1-dev-plus-aosp 2022-07-19 18:50:47 +00:00
Julia Reynolds
b583e1c49d [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I58259754379df7a77c2d68fe1fae3c4071839dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:39 +00:00
Julia Reynolds
783475f61a [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 1da6986a74 -s ours am: 0d51dea4a3 -s ours am: 2db3822574 -s ours am: c16fad2381 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: I59361ddb41735a07b4e65fcb0a93e89685855c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:38 +00:00
Julia Reynolds
78ca839503 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: c6b1d5249d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I414558c1adeffd876a7dd6f43364253d492bef9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:29 +00:00
Julia Reynolds
93fa0be217 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Id5d3833f73a3c65d6088eb1678852d1c8b3207bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:28 +00:00
Julia Reynolds
b904a4b00d [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 -s ours am: be54af47eb -s ours am: 94d408e520 -s ours am: 6e3040511c -s ours am: 435ee3eb75 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 7d2960633d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205942

Change-Id: I8c7bef8011dc3535c4afbac87afcf4d560d99d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:27 +00:00
Automerger Merge Worker
cdcc9a23b5 Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours" into tm-d1-dev-plus-aosp 2022-07-19 18:50:21 +00:00
Patrick Rohr
acdb443af1 Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89ed am: 6d338ccf26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152437

Change-Id: I6ec712a135064e189db4df782764451bfde1ae32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:19 +00:00
Julia Reynolds
c4819d07ee [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: c49d4cd750 -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Ibefec0b76784ea74aa1eb4a20391f661675d6897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:14 +00:00
Julia Reynolds
4fe1289d05 [automerger skipped] Limit the number of concurrently snoozed notifications am: 455a525421 -s ours am: 24b6a449df -s ours am: 69f6c9df8d -s ours am: 3986f9c8e5 -s ours am: 577182ee77 -s ours am: fca1820a9d -s ours 
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 bc808de2f8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205943

Change-Id: Icf8b371614a206369006d9f9847e429557ede5d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:50:13 +00:00
Automerger Merge Worker
95c26b78fe Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -s ours" into tm-d1-dev-plus-aosp 2022-07-19 18:50:06 +00:00
Julia Reynolds
fa436a1fa1 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: eae4f6b506 -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/+/19205942

Change-Id: I2f639acd81afc37e41fe350db6427afabf1bd4ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:49:52 +00:00
Julia Reynolds
3123c5cf36 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -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/+/19205942

Change-Id: Id7417690d5613e0dcfb6b0fc977680cb3759c525
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:49:50 +00:00
Julia Reynolds
93380329a6 [automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2f8 am: 0753020228 am: 1b9f7e5b8c -s ours am: 9a0bdd958a -s ours am: 3d4a0fd16e -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/+/19205942

Change-Id: I4c470f7db883eb71b114fea81e073d851edd8d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:49:50 +00:00
Chris Tate
ed8716bb24 Merge "BroadcastOption for "this is an alarm broadcast"" into tm-qpr-dev am: 3420a4e6fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19323855

Change-Id: I98a9f11b506dbacfcb1e5b066598d213f990d42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 18:39:56 +00:00