From 78d4e6dc7be59fcbf2be83ebd6a87dd371cb4fb6 Mon Sep 17 00:00:00 2001
From: Darryl L Johnson <darryljohnson@google.com>
Date: Fri, 24 Apr 2020 16:37:28 -0700
Subject: Add test to ensure virtual display orientation doesn't change when
 device rotates.

Bug: 148639826
Bug: 149213586

Test: ActivityThreadTest#testOrientationChangeDoesntOverrideVirtualDisplayOrientation

Change-Id: I74d5d9ad6d051e1059ca03102716319ac1b674a7
---
 core/java/android/app/ActivityThread.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'core/java/android/app/ActivityThread.java')

diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index bea85a9974d9..361149c2f017 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3085,6 +3085,11 @@ public final class ActivityThread extends ClientTransactionHandler {
         return mActivities.get(token);
     }
 
+    @VisibleForTesting(visibility = PACKAGE)
+    public Configuration getConfiguration() {
+        return mConfiguration;
+    }
+
     @Override
     public void updatePendingConfiguration(Configuration config) {
         synchronized (mResourcesManager) {
-- 
cgit v1.2.3