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>
This commit is contained in:
Wei Sheng Shih
2023-01-09 03:58:55 +00:00
committed by Automerger Merge Worker

View File

@@ -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;