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

parent d9ecfa00

core/java/android/view/View.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {