From 59beefe79e8256490b49b46b7a48b2dde6b9ea02 Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Mon, 23 Mar 2020 11:45:46 -0700
Subject: [PATCH] Temporal fix of the Android Auto orientation chaniging on
 phone's orientation change.

Bug: 149213586
Test: Connect the phone to Android Auto car and open Chrome and rotate the phone.
Change-Id: I7e76904ee8a50b9a9db4e99b6adcdb4b70d42fdb
---
 core/java/android/app/ResourcesManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index 5f756033390b8..88175bcfcf247 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -1120,7 +1120,9 @@ public class ResourcesManager {
             daj = new DisplayAdjustments(daj);
             daj.setCompatibilityInfo(compat);
         }
-        daj.setConfiguration(config);
+        if (displayId == Display.DEFAULT_DISPLAY) {
+            daj.setConfiguration(config);
+        }
         DisplayMetrics dm = getDisplayMetrics(displayId, daj);
         if (displayId != Display.DEFAULT_DISPLAY) {
             applyNonDefaultDisplayMetricsToConfiguration(dm, tmpConfig);