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
d4470c4ece Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d6245c am: 4dde1ee814 am: 76443bd35d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159641

Change-Id: I51f3789c10555e0b8fe2eb0f669594476b2284a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:38:53 +00:00
Julia Reynolds
3f0d1a7985 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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 21:38:32 +00:00
Julia Reynolds
59f1e6a43a [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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 21:38:30 +00:00
TreeHugger Robot
8426faea4f Merge "Revert "Revert "Crop windowing layer to that of display size in screen rotation animation""" into tm-qpr-dev 2022-07-19 21:32:19 +00:00
Automerger Merge Worker
06cd3c55c4 Merge changes from topic "am-3e14d9b0dffe4d1299676382c30e388a" into tm-d1-dev-plus-aosp am: f1707e0c9c -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/+/19341499

Change-Id: I2410fa8af71c6472f40f6393fcc302c8189fa7b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:30:29 +00:00
Julia Reynolds
559f83748e [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: f2e80710d4 -s ours am: cfab806930 -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: Iafcf183f34c6c735cb567da78b8224694083809c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:30:18 +00:00
Julia Reynolds
bf854f0a86 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: cf0aab3a02 -s ours am: d0a19d31c5 -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: I1bde26c31d4f1f10d0db6adf6e82bced674ee031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:29:40 +00:00
Julia Reynolds
0016cf5a97 [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: d63761e46e -s ours am: 193579dd47 -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: I1c9a464341f1b6ae8cac9d62e0de26d1bfd957d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:29:16 +00:00
Julia Reynolds
ccdd838e56 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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 21:21:47 +00:00
Julia Reynolds
2af6d80002 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: f2e80710d4 -s ours am: 200cc53622 -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: Ia1ab74bde096750cf14e0acf9364f3af0ca04fb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:21:06 +00:00
Julia Reynolds
f4c08a8925 [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: 5d9762edcc -s ours am: f1638c2685 -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: I54ba9b4f686ecbee6f73090ee67376501f165587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:20:53 +00:00
Julia Reynolds
d1e53dc1dc [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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 21:20:43 +00:00
Alex Stetson
bbe98fef6a Merge "Update topFocusedWindowChanged API" into tm-qpr-dev am: eb04bd2461 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19240597

Change-Id: I784ce823efcb530e66f87ab547a0c550fac1fd81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:20:34 +00:00
Andrew Chant
76443bd35d Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d6245c am: 4dde1ee814 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159641

Change-Id: I01f63f31bf3c210149a0a232e8f00ccae01a9024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:14:40 +00:00
Automerger Merge Worker
f1707e0c9c Merge changes from topic "am-3e14d9b0dffe4d1299676382c30e388a" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: f2e80710d4 -s ours
  [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: 5d9762edcc -s ours
 2022-07-19 21:05:08 +00:00
Julia Reynolds
cfab806930 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: f2e80710d4 -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: I0ac71bf159963f30220b5b9929a7a651bc2c4005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:05:00 +00:00
Julia Reynolds
d0a19d31c5 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: cf0aab3a02 -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: I818d79d6c1cbea8607ccd7338f119ef0aa9c1046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:04:57 +00:00
Julia Reynolds
193579dd47 [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: d63761e46e -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: I50783e6032fba86542ee91d3fb75c400f489c4ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:04:55 +00:00
Julia Reynolds
aa40c135e0 [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: 5d9762edcc -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: I4456c0cdee9bace0bc1d32c39780fd9b842cd38a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:04:55 +00:00
Julia Reynolds
200cc53622 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90a1 -s ours am: f2e80710d4 -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: I1e96a4efb0685c3804ed39518cf06d9799519ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:04:54 +00:00
Julia Reynolds
f1638c2685 [automerger skipped] Revert "Revert "Limit the number of concurrently snoozed notifications"" am: e2ceb6acfa -s ours am: 5d9762edcc -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: I1852e330473d01ef01715e67dc059288c0d8cc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 21:04:52 +00:00
Julia Reynolds
fd03677090 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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 21:03:40 +00:00
Alex Stetson
eb04bd2461 Merge "Update topFocusedWindowChanged API" into tm-qpr-dev 2022-07-19 21:01:49 +00:00
Andrew Chant
4dde1ee814 Merge "Revert "Remove unused net-module-utils-srcs filegroup."" am: 1ae7d6245c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2159641

Change-Id: If19ec868ddbab89e29d523828a59543e492509e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:48:50 +00:00
Julia Reynolds
f2e80710d4 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently 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: Ie37ccae304077b1a89ea16cb7060a5c97919e05e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:47:54 +00:00
Julia Reynolds
5d9762edcc [automerger skipped] Revert "Revert "Limit the number of concurrently 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: I17d45310ce94817b42ecc4f560ca8af1e33f38e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:47:45 +00:00
Xiaowen Lei
506d117d89 Merge "Move Weather and AQI complications to vendor/unbundled_google." into tm-qpr-dev am: 22f40b1e22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19324648

Change-Id: Id0cefb5bcd2e9830d62430b0a879dc707f87ad8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:46:20 +00:00
Julia Reynolds
cf0aab3a02 [automerger skipped] Merge "Revert "Revert "Limit the number of concurrently 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: If7f21882cbc3c8f46a58d83a98cd3174c6b353e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:46:11 +00:00
Julia Reynolds
d63761e46e [automerger skipped] Revert "Revert "Limit the number of concurrently 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: I68dd7d112d3ac80f6c999c94eba63cb43f2425c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:45:46 +00:00
TreeHugger Robot
0b7b0367e2 Merge "Update media play/pause containers" into tm-qpr-dev am: eaa52a461d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19299704

Change-Id: I917d2768897120ce701e0508ebdb931887ac36ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:45:20 +00:00
Julia Reynolds
9b119e761f [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed 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-19 20:45:18 +00:00
Sean McQuillan
81cde0b584 Don't crash after unsetting char[] in TextView 
TextView.setText(char[]) is from API 1 and follows a running with
scissors API style of not copying the passed array.

To avoid a leak, in TextView.setText(String), the char[] would be nulled
out. However, an internal object could have been read using .getText()
prior to this second setText would immmediatly become a
CharSequence that crashed when you called any methods on it.

After this change, the CharWrapper will stay valid if had been
previously retrieved. The general shape of the API will be maintained.

Fixes: b/227218386
Test: atest android.widget.TextViewTest
Relnote: "Calling TextView.getText() after calling TextView.setText(char[])
will now return a valid CharSequence. The char[] pointed to by this char
sequnece may still be mutated by future calls to setText(char[]), but it
will no longer allow a (char[]) null to be set, which lead to crashes
when reading CharSequence returned from getText on TextView."

Merged-In: I35a2a76d58ec1946dace2f615cacf6a6085efdeb

Change-Id: I35a2a76d58ec1946dace2f615cacf6a6085efdeb
(cherry picked from commit 166c7217f4)
 2022-07-19 20:38:10 +00:00
Xiaowen Lei
22f40b1e22 Merge "Move Weather and AQI complications to vendor/unbundled_google." into tm-qpr-dev 2022-07-19 20:32:37 +00:00
Andrew Chant
1ae7d6245c Merge "Revert "Remove unused net-module-utils-srcs filegroup."" 2022-07-19 20:32:22 +00:00
TreeHugger Robot
eaa52a461d Merge "Update media play/pause containers" into tm-qpr-dev 2022-07-19 20:30:19 +00:00
Andrew Chant
fdff6e62d3 Revert "Remove unused net-module-utils-srcs filegroup." 
Revert submission 2152437-remove-net-module-utils-srcs

Reason for revert: broke build.
Bug: 239599703
Reverted Changes:
I058e1aa37:Remove unused net-module-utils-srcs filegroup.
I7c8a12372:Remove unused net-module-utils-srcs filegroup.

Change-Id: Ib9f9319fd6dfade634eda65cafc8c9f7b643f3bb
 2022-07-19 20:27:51 +00:00
Julia Reynolds
b90c6b90a1 Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev 2022-07-19 20:23:12 +00:00
Jeff Sharkey
ad18b6f58c Merge changes from topic "jul15" am: 0e27faa039 am: 954431c4df am: fd0915aeec am: 70123a912d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: I6d5cc1577c71cf60fe16c62d5523cfb5c3a10468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:20:04 +00:00
Alex Buynytskyy
55ed59b2d8 [automerger skipped] Cache least recently used output buffer. am: 2be5b4c118 -s ours am: 574659e3dd -s ours am: 8e73e7abae -s ours am: 0fc97deef9 -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: If7015c4b70afaf559b43782cc4894ea79d8a61c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:19:54 +00:00
TreeHugger Robot
7af8660cf1 Merge "Initialize port list in UiccSlotInfo constuctor" into tm-qpr-dev am: ce91d5fe1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19230679

Change-Id: Iab1bae4d7101ed027096801da0500a87c1be8ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:19:30 +00:00
Julia Reynolds
a6d920e3d6 [automerger skipped] DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 am: c1d1396751 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0cba09ba7d819239928de3a1ff04d14f2a01b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:19:17 +00:00
Jeff Sharkey
70123a912d Merge changes from topic "jul15" am: 0e27faa039 am: 954431c4df am: fd0915aeec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: I33a63a8ffcab5ad2e7a93b1a111a214e152a580c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:03:47 +00:00
Alex Buynytskyy
0fc97deef9 [automerger skipped] Cache least recently used output buffer. am: 2be5b4c118 -s ours am: 574659e3dd -s ours am: 8e73e7abae -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: Ie0453e283f29e6fba024a1c03746bb73c8df2224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:03:43 +00:00
Julia Reynolds
c1d1396751 DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944

Change-Id: I7170c031c2aa4ca409eb1965c6ed20085fac7801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 20:02:16 +00:00
TreeHugger Robot
ce91d5fe1d Merge "Initialize port list in UiccSlotInfo constuctor" into tm-qpr-dev 2022-07-19 19:58:20 +00:00
Jeff DeCew
d0cd38bc41 Require InteractionJankMonitor. 
Bug: 229249877
Test: atest GhostedViewLaunchAnimatorControllerTest
Change-Id: I3be89f81270e3492cbc7dc111165a91d12d69588
 2022-07-19 19:39:56 +00:00
Jeff Sharkey
fd0915aeec Merge changes from topic "jul15" am: 0e27faa039 am: 954431c4df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2155659

Change-Id: Iaca2952323dcae1b8dbec5f9ffb6c5c434f2c69c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:36:31 +00:00
Alex Buynytskyy
8e73e7abae [automerger skipped] Cache least recently used output buffer. am: 2be5b4c118 -s ours am: 574659e3dd -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: Iae869cb3e115676342eca12b6b68960af6603274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:36:20 +00:00
TreeHugger Robot
970f2df3c6 Merge "Prevent displays that are disabled from receiving input" into tm-qpr-dev am: 3ca7a5ab25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19299674

Change-Id: Ib64c47c955f4f44beb538f62a8a8669a84257041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:26:22 +00:00
Automerger Merge Worker
e38cd4da33 Merge "Merge "Remove unused net-module-utils-srcs filegroup." am: 4b8edd89ed am: 6d338ccf26 am: acdb443af1" into tm-d1-dev-plus-aosp am: bd3906c2c4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152437

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