Merge "Fixes NPE crash when VRI#setView fail before input stage was create." into tm-qpr-dev

2023-01-09 03:24:39 +00:00
parent 3df235fae6 bd4ab03840
commit f2b5978c5c
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -1274,7 +1274,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;