Fixes NPE crash when VRI#setView fail before input stage was create.
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:
@@ -1257,7 +1257,7 @@ public final class ViewRootImpl implements ViewParent,
|
||||
mTmpFrames.attachedFrame = attachedFrame;
|
||||
mTmpFrames.sizeCompatScale = sizeCompatScale[0];
|
||||
mInvSizeCompatScale = 1f / sizeCompatScale[0];
|
||||
} catch (RemoteException e) {
|
||||
} catch (RemoteException | RuntimeException e) {
|
||||
mAdded = false;
|
||||
mView = null;
|
||||
mAttachInfo.mRootView = null;
|
||||
|
||||
Reference in New Issue
Block a user