commit 14374e509732c0810b6b2cda131c09020348968e
author Ahaan Ugale <augale@google.com> Tue Feb 01 02:24:21 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 01 02:24:21 2022 +0000
tree b415c839600cc1e1bf5008632c366fa0db31fefd
parent 3b54e697be518e9b4d1b803dbc5b10db77de2f3e
parent 696fcca53f2376d4e4d95b8b77acc7483c3f8d97

Merge changes from topic "presubmit-am-64e6e8709f7d4e6a844c50eac8f28918" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix Activity leak from ContentCapture Context-Updated event. 2p: 93debeaead
  Fix Activity leak from ContentCapture Context-Updated event.

libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java
index fd3be2b..f988492 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/draganddrop/DragLayout.java
@@ -103,7 +103,7 @@
                 MATCH_PARENT));
         ((LayoutParams) mDropZoneView1.getLayoutParams()).weight = 1;
         ((LayoutParams) mDropZoneView2.getLayoutParams()).weight = 1;
-        updateContainerMargins();
+        updateContainerMargins(getResources().getConfiguration().orientation);
     }
 
     @Override
@@ -128,20 +128,18 @@
     }
 
     public void onConfigChanged(Configuration newConfig) {
-        final int orientation = getResources().getConfiguration().orientation;
-        if (orientation == Configuration.ORIENTATION_LANDSCAPE
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE
                 && getOrientation() != HORIZONTAL) {
             setOrientation(LinearLayout.HORIZONTAL);
-            updateContainerMargins();
-        } else if (orientation == Configuration.ORIENTATION_PORTRAIT
+            updateContainerMargins(newConfig.orientation);
+        } else if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT
                 && getOrientation() != VERTICAL) {
             setOrientation(LinearLayout.VERTICAL);
-            updateContainerMargins();
+            updateContainerMargins(newConfig.orientation);
         }
     }
 
-    private void updateContainerMargins() {
-        final int orientation = getResources().getConfiguration().orientation;
+    private void updateContainerMargins(int orientation) {
         final float halfMargin = mDisplayMargin / 2f;
         if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
             mDropZoneView1.setContainerMargin(