Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an NPE on cancellation when connection is closed

Browse Source 
Store the future locally so the callback doesn't lose
a reference to it. Even when the field is cleared, the
callback will always receive the original value, avoiding
NPEs. This change also adds a test for cancellation instead
of falling through to an ignored CancellationException.

Bug: 219965002
Test: manual; timing dependent, dismiss screenshot while
      scroll capture request is in flight
Change-Id: I88918bbe9379208cad9456b53ed79d600c73a60b
This commit is contained in:
Mark Renouf
2022-04-27 13:31:58 -04:00
parent b5310919c8
commit 649ca6d383
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -674,15 +674,21 @@ public class ScreenshotController {
if (mLastScrollCaptureRequest != null) {
mLastScrollCaptureRequest.cancel(true);
}
mLastScrollCaptureRequest = mScrollCaptureClient.request(DEFAULT_DISPLAY);
final ListenableFuture<ScrollCaptureResponse> future =
mScrollCaptureClient.request(DEFAULT_DISPLAY);
mLastScrollCaptureRequest = future;
mLastScrollCaptureRequest.addListener(() ->
onScrollCaptureResponseReady(mLastScrollCaptureRequest), mMainExecutor);
onScrollCaptureResponseReady(future), mMainExecutor);
}
private void onScrollCaptureResponseReady(Future<ScrollCaptureResponse> responseFuture) {
try {
if (mLastScrollCaptureResponse != null) {
mLastScrollCaptureResponse.close();
mLastScrollCaptureResponse = null;
}
if (responseFuture.isCancelled()) {
return;
}
mLastScrollCaptureResponse = responseFuture.get();
if (!mLastScrollCaptureResponse.isConnected()) {
@@ -707,8 +713,6 @@ public class ScreenshotController {
// delay starting scroll capture to make sure the scrim is up before the app moves
mScreenshotView.post(() -> runBatchScrollCapture(response));
});
} catch (CancellationException e) {
// Ignore
} catch (InterruptedException | ExecutionException e) {
Log.e(TAG, "requestScrollCapture failed", e);
}