Commit Graph

771427 Commits

Author SHA1 Message Date
Jeff Nainaparampil
59b2f1743d Fix unbounded number of uncached shortcuts
There is a consistency issue in which some cached conversations in
People Service do not get cleaned up because they are missing a event
timestamp. For those cases, we use the creation timestamp to order by
recency and still clean up those conversations.

This change will enforce that at most `MAX_CACHED_RECENT_SHORTCUTS` are
cached by People Service for uncustomized conversations as expected.

Test: Manually with app that creates cached shortcuts and unit tests
Bug: 233926836
Change-Id: Ia017917ea56f2e233fdb837e574a8bd7c0d69e3b
2022-08-17 15:04:51 +00:00
Riddle Hsu
4f28845c84 Merge "Skip syncing local window for rotation with shell transition" into tm-qpr-dev 2022-07-22 16:18:30 +00:00
Vania Januar
947e01c8db Collapse the notification shade when closing the QS using the back button in split shade mode.
CentralSurfacesImpl.onBackPressed() was collapsing the QS to QQS on the first back button tap, but when in split shade mode closing the Qs does nothing. Now NotificationPanelViewController.animateCloseQs() will run collapsePanel() to close the entire panel if mSplitShadeEnabled.

Fixes: 234306461
Test: manually checking the notification panel closes with one back button tap
Test: NotificationPanelViewControllerTest
Change-Id: I99d8b06846214344011d5ee6f590193594d6e247
2022-07-22 16:07:45 +00:00
Vania Januar
6f6f87283f Merge "Moving PanelViewController and PanelView to android.systemui.shade." into tm-qpr-dev 2022-07-22 14:55:02 +00:00
Vania Januar
9fe52e1d71 Moving PanelViewController and PanelView to android.systemui.shade.
As PanelViewController seems very related to
NotificationPanelViewController it might be better for them to live in
the same package. Imports have been updated and the scoping has been
expanded as necessary. This is a follow up from ag/19202451.

Bug: 238333941
Test: atest SystemUITests
Change-Id: Ief8ad6dc74056ab3292b94c191eea0e5d209996c
2022-07-22 14:49:35 +00:00
Fabian Kozynski
e373c68b34 Merge "Add new headers flags to teamfood" into tm-qpr-dev 2022-07-22 13:10:59 +00:00
Fabian Kozynski
c510752d5a Merge "Add per-file to OWNERS" into tm-qpr-dev 2022-07-22 13:09:28 +00:00
Hawkwood Glazier
e4e9587dc6 Merge "Add per glyph filter for tweaking glyph positions for animation" into tm-qpr-dev 2022-07-22 12:11:39 +00:00
Joanne Chung
a88654665d Merge "Revert "Add event log for content capture"" into tm-qpr-dev 2022-07-22 08:13:58 +00:00
Christian Göllner
09f7ed7e3a Merge "[Split shade] Fix large clock moving horizontally during screen off" into tm-qpr-dev 2022-07-22 07:09:11 +00:00
Suprabh Shukla
4682c3ec5b [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: ef65df9223 -s ours am: d4387bc62a -s ours am: 75542b97d6 -s ours am: 2cf203a185 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I4ebb5eaf5f38975245c0ac768915692f7ccbbde4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 07:09:05 +00:00
Suprabh Shukla
934c3e6056 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -s ours am: 48ff28ba37 -s ours am: 6aba56c2c2 -s ours am: 18d9b66f14 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Icb4429ab2964c0a524d08500ec9b0388afb364fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 07:09:03 +00:00
Suprabh Shukla
a58cd3bea7 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: 1b5540e074 -s ours am: 4fd7462388 -s ours am: a6da198cb6 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ida56ea4126bb6ab366ec08c757e031455d95ace4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 07:08:44 +00:00
Suprabh Shukla
689ad6df4f [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: 255d1e5ff0 -s ours am: dffdd18fa1 -s ours am: dbb8cab450 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I1e1070430924543ffc65922ceaab94c7b8410ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 07:08:41 +00:00
Suprabh Shukla
2cf203a185 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: ef65df9223 -s ours am: d4387bc62a -s ours am: 75542b97d6 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I21d234bdb1eb92e237ad7389b340dadaa1948023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:52:29 +00:00
Suprabh Shukla
18d9b66f14 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -s ours am: 48ff28ba37 -s ours am: 6aba56c2c2 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I749e1c0567e21093966cca3c6823032305a3205e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:52:26 +00:00
Suprabh Shukla
a6da198cb6 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: 1b5540e074 -s ours am: 4fd7462388 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ibde4bb55d57ac54f94b9ab985e9e1b11ad5b7e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:52:09 +00:00
Suprabh Shukla
dbb8cab450 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: 255d1e5ff0 -s ours am: dffdd18fa1 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I1a26f43cf72a09f068d15fbce1876fac80dc7648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:52:01 +00:00
Suprabh Shukla
75542b97d6 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: ef65df9223 -s ours am: d4387bc62a -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I47fbfc4cd2270c7a3309dbe3a8c6ddb7b4028158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:50:35 +00:00
Suprabh Shukla
6aba56c2c2 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -s ours am: 48ff28ba37 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I266075346edbfb6e2a34fc6dc20ae310b6eb6ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:50:23 +00:00
Suprabh Shukla
4fd7462388 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: 1b5540e074 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I6300cd69ced10de47d4ca6f8f76f545ea9d6a768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:37:03 +00:00
Suprabh Shukla
d4387bc62a [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: ef65df9223 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I2b9c7966fa0917b25ae8aee105ef435fd0950723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:36:45 +00:00
Suprabh Shukla
dffdd18fa1 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: 255d1e5ff0 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I8870c4ab1087133b341ff4e885491b397c9f42d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:36:30 +00:00
Suprabh Shukla
48ff28ba37 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours am: d2b8102403 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I5af3771bd42f3a128ee7524ad188a455c3bb4db6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 06:36:30 +00:00
Suprabh Shukla
ef65df9223 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ie92a647cc50646fdbf2f7eccae097c145ad763f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:54:48 +00:00
Suprabh Shukla
d2b8102403 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I581c585ea81bbc7e88a09a50af0c1d5d795fcaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:54:45 +00:00
Suprabh Shukla
1b5540e074 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I8cde5895a7711c86bcc99fb89862c0f1102b22e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:53:52 +00:00
Suprabh Shukla
255d1e5ff0 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours am: 63e138df10 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I9e55857ce05aedc189b70101d7075e8791346b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:53:40 +00:00
Suprabh Shukla
0ded155f96 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I24edf0e10aab3bc511a7978cb24258911c71efed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:29:06 +00:00
Suprabh Shukla
63e138df10 [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours am: 60276bee2d -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ic6f11c6c8de6312c1b1b8233bbeae50e0d3f7e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:28:30 +00:00
Suprabh Shukla
566f694615 [automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: I0e77efe83a23fcecda2639f0284b981a5a7f5db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:11:08 +00:00
Suprabh Shukla
60276bee2d [automerger skipped] Stop crashing the system on hitting the alarm limit am: 909251a2ca -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history

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

Change-Id: Ia9194cffec3f973a504dccdfac89b10b0f8f46b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 05:11:00 +00:00
Suprabh Shukla
da44101e4f Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev 2022-07-22 04:35:18 +00:00
Winson Chung
2e0ed6a63b Merge "Fix crash caused by accessing finishing task" into tm-qpr-dev 2022-07-22 04:05:15 +00:00
Tiger Huang
a1be3b43bb Merge "Enable privileged apps to set unrestricted gesture exclusion" into tm-qpr-dev 2022-07-22 03:31:41 +00:00
Gaurav Bhola
928c9c0eec Merge "Add a new Insets type for overlapping windows." into tm-qpr-dev 2022-07-22 03:31:21 +00:00
TreeHugger Robot
cbef171d2f Merge "Collect tasks when windowing mode of parent display changes" into tm-qpr-dev 2022-07-22 01:40:26 +00:00
Binyi Wu
9c04c0ada9 Merge "Create a feature flag for Clear Calling" into tm-qpr-dev 2022-07-22 00:27:29 +00:00
Beth Thibodeau
8d5e38f727 Fix crash when loading album art by resource am: d0c1f811af am: 3457487184
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19366451

Change-Id: I632ac9b527e2d9d50d2f920a60841bfc774b627e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:49:32 +00:00
Suprabh Shukla
c0d0ca8881 Merge "Allowlist alarm-clock alarms from pre-S apps for FGS" into tm-qpr-dev 2022-07-21 21:28:50 +00:00
Joshua Mccloskey
1bb0afbdf4 Merge "Fixed FaceProvider logging." into tm-qpr-dev 2022-07-21 21:26:00 +00:00
Beth Thibodeau
3457487184 Fix crash when loading album art by resource am: d0c1f811af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19366451

Change-Id: I475a264619e17e84997d40ddff4032eb3e379b9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:14:58 +00:00
Jayant Chowdhary
8023620746 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev am: 138fc75ad4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19354614

Change-Id: Iaf4d48ea9d31b053f78f788e0f651b7ba1c5c8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 21:06:35 +00:00
Liana Kazanova
27cd8480db Merge "Fix jumping slider in split shade" into tm-qpr-dev 2022-07-21 20:54:43 +00:00
Jayant Chowdhary
138fc75ad4 Merge "camera2: update original ByteBuffer using bulk get on 'viewed' ByteBuffer for correct position" into tm-d1-dev 2022-07-21 20:41:45 +00:00
Julia Reynolds
e01425ec92 Merge "Fix binder error when an app has many channels" into tm-qpr-dev 2022-07-21 20:30:21 +00:00
Chris Kuiper
6feef8385d Revert "Add event log for content capture"
This reverts commit 9fa9fc8bc5.

Reason for revert: Break Android tests.

Change-Id: I40bfba94ef1a8a5991feedfd24122ff45ba37912
2022-07-21 20:07:06 +00:00
TreeHugger Robot
928a1ea2e8 Merge "Revert "Adjust smallestScreenWidthDp for letterbox"" into tm-qpr-dev 2022-07-21 20:01:21 +00:00
Alex Buynytskyy
dd7853a610 Merge "Use the same application info instance." into tm-qpr-dev 2022-07-21 19:58:32 +00:00
Fabian Kozynski
f44e8220a1 Add new headers flags to teamfood
Test: no test
Bug: 215584502
Change-Id: I902505225e781eb6f6e26f59da77a60a20469b6c
2022-07-21 15:40:31 -04:00