From eaddac6d2662f4443561a75b355c472c751ef6fc Mon Sep 17 00:00:00 2001
From: Chris Craik <ccraik@google.com>
Date: Thu, 25 Apr 2013 15:32:40 -0700
Subject: [PATCH] Force clipping on layers that fail to be allocated

bug:8666842

In SW rendering, a previous optimization avoided clipping to the
bounds of views that are layers. This breaks if the view fails to
create a layer (such as if it's too big), so instead look at whether
the view has a layer.

Change-Id: I653882035512012aefd91f06ff0bdc73aa5e4430
---
 core/java/android/view/View.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 11e392d50098e..b5aa18f7d41fa 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -13785,7 +13785,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
         }
 
         if ((flags & ViewGroup.FLAG_CLIP_CHILDREN) == ViewGroup.FLAG_CLIP_CHILDREN &&
-                !useDisplayListProperties && layerType == LAYER_TYPE_NONE) {
+                !useDisplayListProperties && cache == null) {
             if (offsetForScroll) {
                 canvas.clipRect(sx, sy, sx + (mRight - mLeft), sy + (mBottom - mTop));
             } else {