Merge "Fix for using HARDWARE layers on unaccelerated views."

1 files changed, 6 insertions, 6 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ecb6bbb..1815a3a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -8876,6 +8876,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
 
         // Destroy any previous software drawing cache if needed
         switch (mLayerType) {
+            case LAYER_TYPE_HARDWARE:
+                if (mHardwareLayer != null) {
+                    mHardwareLayer.destroy();
+                    mHardwareLayer = null;
+                }
+                // fall through - unaccelerated views may use software layer mechanism instead
             case LAYER_TYPE_SOFTWARE:
                 if (mDrawingCache != null) {
                     mDrawingCache.recycle();
@@ -8887,12 +8893,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
                     mUnscaledDrawingCache = null;
                 }
                 break;
-            case LAYER_TYPE_HARDWARE:
-                if (mHardwareLayer != null) {
-                    mHardwareLayer.destroy();
-                    mHardwareLayer = null;
-                }
-                break;
             default:
                 break;
         }