commit 89d87f04bc5edf0439d997fdb391fa6f667a23bc
author Jeff Sharkey <jsharkey@android.com> Mon Nov 14 14:20:19 2022 -0700
committer Jeff Sharkey <jsharkey@android.com> Mon Nov 14 14:26:59 2022 -0700
tree 7ae962a320132249c7a9ed8d600681e4b49ba9e9
parent 81d66e9d7704274157176ca8ad8458474608c269

BroadcastQueue: fix subtle soft/hard timeout bug.

deliveryTimeoutSoftLocked() had been using mConstants.TIMEOUT for
clamping purposes, but that always ended up being the foreground
timeout, even for background broadcasts.

Fix this bug by passing through the actual ANR timeout value used,
and apply that for clamping purposes, making sure we're always
willing to up to double the original timeout.

Bug: 258204427
Test: atest FrameworksMockingServicesTests:BroadcastRecordTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueTest
Test: atest FrameworksMockingServicesTests:BroadcastQueueModernImplTest
Change-Id: I8414630db0b7a7d6ea8df86931220ce6c5fc1671