From 8068ec2ef12f2ed4e697d2031b50e57778a31970 Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Fri, 2 Jun 2017 09:58:00 -0700
Subject: [PATCH] Initialize last-orientation to ensure we don't skip loading
 config.

- This was a regression introduced in ag/2297883

Bug: 62191663
Test: Launch PiP, open settings
Change-Id: I66c28b57361143f2df927776dba5bc58a022bcb4
---
 .../src/com/android/systemui/pip/tv/PipManager.java         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index 5414aad0a63f3..f98310dd7aa1f 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -239,7 +239,11 @@ public class PipManager implements BasePipManager {
             }
         }
 
-        loadConfigurationsAndApply(mContext.getResources().getConfiguration());
+        // Initialize the last orientation and apply the current configuration
+        Configuration initialConfig = mContext.getResources().getConfiguration();
+        mLastOrientation = initialConfig.orientation;
+        loadConfigurationsAndApply(initialConfig);
+
         mMediaSessionManager =
                 (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE);