From 39dd370d8e0d04e1a860afc4136ad6bd6d521018 Mon Sep 17 00:00:00 2001
From: Michael Kwan <mkwan@google.com>
Date: Mon, 9 Jan 2017 13:43:52 -0800
Subject: [PATCH] Check if the activity translucency was converted before
 converted back.

Bug: 34084490
Change-Id: Ib04c76549a31c7e523649f9d284637d44d7477ae
---
 .../com/android/internal/widget/SwipeDismissLayout.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/com/android/internal/widget/SwipeDismissLayout.java b/core/java/com/android/internal/widget/SwipeDismissLayout.java
index e80d812618c8e..2a5957ce0ca23 100644
--- a/core/java/com/android/internal/widget/SwipeDismissLayout.java
+++ b/core/java/com/android/internal/widget/SwipeDismissLayout.java
@@ -79,6 +79,7 @@ public class SwipeDismissLayout extends FrameLayout {
     private VelocityTracker mVelocityTracker;
     private float mTranslationX;
     private boolean mBlockGesture = false;
+    private boolean mActivityTranslucencyConverted = false;
 
     private final DismissAnimator mDismissAnimator = new DismissAnimator();
 
@@ -277,8 +278,9 @@ public class SwipeDismissLayout extends FrameLayout {
     protected void cancel() {
         if (!mIsWindowNativelyTranslucent) {
             Activity activity = findActivity();
-            if (activity != null) {
+            if (activity != null && mActivityTranslucencyConverted) {
                 activity.convertFromTranslucent();
+                mActivityTranslucencyConverted = false;
             }
         }
         if (mProgressListener != null) {
@@ -319,7 +321,7 @@ public class SwipeDismissLayout extends FrameLayout {
             if (!mIsWindowNativelyTranslucent) {
                 Activity activity = findActivity();
                 if (activity != null) {
-                    activity.convertToTranslucent(null, null);
+                    mActivityTranslucencyConverted = activity.convertToTranslucent(null, null);
                 }
             }
         }