| commit | 5897b777b80fe6df83107e64ecd0e7011da92968 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Wed Sep 28 03:41:55 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 28 03:41:55 2022 +0000 |
| tree | 844881e5a14ce49e4c992287ab429f2580ceab13 | |
| parent | 1c862c1988055e52dfc093d87b728a217f0f8360 [diff] | |
| parent | 54c1a91912d197ffed724873093ba87f73c762c7 [diff] |
Merge "Make bitmap nullable in ViewCapture" into tm-qpr-dev am: 2dff081f99 am: 54c1a91912 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20054727 Change-Id: Ic0ef9926ded4472d565a80601822ad660b810436 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewCapture.kt b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewCapture.kt index cdedc64..9766514 100644 --- a/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewCapture.kt +++ b/packages/SystemUI/screenshot/src/com/android/systemui/testing/screenshot/ViewCapture.kt
@@ -93,8 +93,8 @@ Futures.addCallback( captureToBitmap(window), object : FutureCallback<Bitmap> { - override fun onSuccess(result: Bitmap) { - continuation.resumeWith(Result.success(result)) + override fun onSuccess(result: Bitmap?) { + continuation.resumeWith(Result.success(result!!)) } override fun onFailure(t: Throwable) {