From 1904969f2c8bd2372ca90b22f5138583d99307ed Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Mon, 8 Apr 2019 11:56:07 -0700
Subject: [PATCH] Fixing edge swipe region not updating on device rotation

Bug: 130028177
Test: Verified on device
Change-Id: If9a68efa84dd4de926115db80a9b68dcbe1e8720
---
 .../systemui/statusbar/phone/EdgeBackGestureHandler.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
index 212666f24b36c..3a6756bb677ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
@@ -204,6 +204,7 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
         if (!mIsEnabled) {
             WindowManagerWrapper.getInstance().removePinnedStackListener(mImeChangedListener);
+            mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
 
             try {
                 WindowManagerGlobal.getWindowManagerService()
@@ -215,6 +216,8 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
         } else {
             updateDisplaySize();
+            mContext.getSystemService(DisplayManager.class).registerDisplayListener(this,
+                    mContext.getMainThreadHandler());
 
             try {
                 WindowManagerWrapper.getInstance().addPinnedStackListener(mImeChangedListener);
@@ -344,7 +347,8 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
     private void updateDisplaySize() {
         mContext.getSystemService(DisplayManager.class)
-                .getDisplay(mDisplayId).getRealSize(mDisplaySize);
+                .getDisplay(mDisplayId)
+                .getRealSize(mDisplaySize);
     }
 
     private void sendEvent(int action, int code) {