Merge "Added checks while unfreezing bounds" into nyc-mr1-dev

2016-06-27 17:19:55 +00:00
parent d6b907d58f 37dbafce9b
commit b59b5a679a
1 changed files with 9 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -626,6 +626,9 @@ class AppWindowToken extends WindowToken {
    }

    void clearRelaunching() {
+        if (mPendingRelaunchCount == 0) {
+            return;
+        }
        if (canFreezeBounds()) {
            unfreezeBounds();
        }
@@ -711,8 +714,12 @@ class AppWindowToken extends WindowToken {
     * Unfreezes the previously frozen bounds. See {@link #freezeBounds}.
     */
    private void unfreezeBounds() {
-        mFrozenBounds.remove();
-        mFrozenMergedConfig.remove();
+        if (!mFrozenBounds.isEmpty()) {
+            mFrozenBounds.remove();
+        }
+        if (!mFrozenMergedConfig.isEmpty()) {
+            mFrozenMergedConfig.remove();
+        }
        for (int i = windows.size() - 1; i >= 0; i--) {
            final WindowState win = windows.get(i);
            if (!win.mHasSurface) {