Merge "Try fix Bundle#getParcelable error for relayout bundle" into main (144bae3f) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+15 −9

Original line number	Diff line number	Diff line
		@@ -9044,20 +9044,26 @@ public final class ViewRootImpl implements ViewParent,
		mTempInsets, mTempControls, mRelayoutBundle);
		mRelayoutRequested = true;

		final int maybeSyncSeqId = mRelayoutBundle.getInt(
		IWindowSession.KEY_RELAYOUT_BUNDLE_SEQID);
		if (maybeSyncSeqId > 0) {
		mSyncSeqId = maybeSyncSeqId;
		}
		if (activityWindowInfoFlag() && mPendingActivityWindowInfo != null) {
		final ActivityWindowInfo outInfo = mRelayoutBundle.getParcelable(
		ActivityWindowInfo outInfo = null;
		try {
		outInfo = mRelayoutBundle.getParcelable(
		IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO,
		ActivityWindowInfo.class);
		mRelayoutBundle.remove(IWindowSession.KEY_RELAYOUT_BUNDLE_ACTIVITY_WINDOW_INFO);
		} catch (IllegalStateException e) {
		Log.e(TAG, "Failed to get ActivityWindowInfo from relayout Bundle", e);
		}
		if (outInfo != null) {
		mPendingActivityWindowInfo.set(outInfo);
		}
		}
		mRelayoutBundle.clear();
		final int maybeSyncSeqId = mRelayoutBundle.getInt(
		IWindowSession.KEY_RELAYOUT_BUNDLE_SEQID);
		if (maybeSyncSeqId > 0) {
		mSyncSeqId = maybeSyncSeqId;
		}

		mWinFrameInScreen.set(mTmpFrames.frame);
		if (mTranslator != null) {
		mTranslator.translateRectInScreenToAppWindow(mTmpFrames.frame);