diff options
| author | 2023-01-09 03:58:55 +0000 | |
|---|---|---|
| committer | 2023-01-09 03:58:55 +0000 | |
| commit | c6bc21fe47e8af46b8c8a147806b3fcd801ad36d (patch) | |
| tree | ffaf9e4d35d95ac6957a544c537bfa7657678545 | |
| parent | 86321b83cfb7fa96a63c727613866f56dfa76436 (diff) | |
| parent | f2b5978c5ce53351ef5ce0c1b00f1e2b1af330ea (diff) | |
Merge "Fixes NPE crash when VRI#setView fail before input stage was create." into tm-qpr-dev am: f2b5978c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20870622
Change-Id: Iab330eba0b60e26fe5a56ed8bae4462caf792331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 5f04d5846977..c8df840af49d 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1273,7 +1273,7 @@ public final class ViewRootImpl implements ViewParent, mTmpFrames.attachedFrame = attachedFrame; mTmpFrames.compatScale = compatScale[0]; mInvCompatScale = 1f / compatScale[0]; - } catch (RemoteException e) { + } catch (RemoteException | RuntimeException e) { mAdded = false; mView = null; mAttachInfo.mRootView = null; |