Fixes #1949502. Prevents an NPE in View.buildDrawingCache().
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index c9a785c..b3180ca 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5922,8 +5922,9 @@
int height = mBottom - mTop;
final AttachInfo attachInfo = mAttachInfo;
+ final boolean scalingRequired = attachInfo != null && attachInfo.mScalingRequired;
- if (autoScale && attachInfo != null && attachInfo.mScalingRequired) {
+ if (autoScale && scalingRequired) {
width = (int) ((width * attachInfo.mApplicationScale) + 0.5f);
height = (int) ((height * attachInfo.mApplicationScale) + 0.5f);
}
@@ -6014,7 +6015,7 @@
computeScroll();
final int restoreCount = canvas.save();
- if (autoScale && attachInfo.mScalingRequired) {
+ if (autoScale && scalingRequired) {
final float scale = attachInfo.mApplicationScale;
canvas.scale(scale, scale);
}