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

Fixes NPE crash when VRI#setView fail before input stage was create.

Browse Source 
Also catch RuntimeException for addToDisplayAsUser in case the throwing
type was not RemoteException.

Bug: 253200800
Test: Simulate to throw a runtime exception in WMS#addWindow, and verify
VRI#setView should catch that exception, and clear resources without
crash.

Change-Id: Ia113b836e4a18c656093f9db7f63e9c50c427e6c
This commit is contained in:
wilsonshih
2022-10-31 10:56:36 +08:00
parent 607ba2fbe3
commit f1a574074a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ViewRootImpl.java
View File

@@ -1257,7 +1257,7 @@ public final class ViewRootImpl implements ViewParent,
mTmpFrames.attachedFrame = attachedFrame; mTmpFrames.attachedFrame = attachedFrame;
mTmpFrames.sizeCompatScale = sizeCompatScale[0]; mTmpFrames.sizeCompatScale = sizeCompatScale[0];
mInvSizeCompatScale = 1f / sizeCompatScale[0]; mInvSizeCompatScale = 1f / sizeCompatScale[0];
} catch (RemoteException e) { } catch (RemoteException | RuntimeException e) {
mAdded = false; mAdded = false;
mView = null; mView = null;
mAttachInfo.mRootView = null; mAttachInfo.mRootView = null;