Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6bc21fe authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20870622



Change-Id: Iab330eba0b60e26fe5a56ed8bae4462caf792331
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86321b83 f2b5978c

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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;