From cdc8ada9c91ff593ed480a48ae8cd6a1c529924a Mon Sep 17 00:00:00 2001 From: Wale Ogunwale Date: Thu, 30 Mar 2017 13:55:36 -0700 Subject: Fix issue with not forwarding config. changes on the window size Coding error inroduced in ag/1965162 where we were no longer setting the config. if the dispatchResized() call originated from a different process. Fixes: 36544847 Test: Change languages and confirm that the status bar changed to the new language. Change-Id: I91d73c9f506f28cf1ba13a55f86f87a1aff80e0b --- core/java/android/view/ViewRootImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index a43b13e659a0..2e201bf108f9 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -6386,7 +6386,7 @@ public final class ViewRootImpl implements ViewParent, args.arg2 = sameProcessCall ? new Rect(contentInsets) : contentInsets; args.arg3 = sameProcessCall ? new Rect(visibleInsets) : visibleInsets; args.arg4 = sameProcessCall && mergedConfiguration != null - ? new MergedConfiguration(mergedConfiguration) : null; + ? new MergedConfiguration(mergedConfiguration) : mergedConfiguration; args.arg5 = sameProcessCall ? new Rect(overscanInsets) : overscanInsets; args.arg6 = sameProcessCall ? new Rect(stableInsets) : stableInsets; args.arg7 = sameProcessCall ? new Rect(outsets) : outsets; -- cgit v1.2.3-59-g8ed1b