summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-04-02 22:38:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-02 22:38:49 +0000
commitec3c97d27f2a424fa847561a3932a40c093a91a1 (patch)
treef9805e9bac2b743eccc886edb296eceea8ca9e31 /core/java/android/view/View.java
parentf4c301bdf52449668d50f31b351d822ec900e687 (diff)
parent3891f3ad598561d5a82c07795e1fee7f1d3612d1 (diff)
downloadframeworks_base-ec3c97d27f2a424fa847561a3932a40c093a91a1.zip
frameworks_base-ec3c97d27f2a424fa847561a3932a40c093a91a1.tar.gz
frameworks_base-ec3c97d27f2a424fa847561a3932a40c093a91a1.tar.bz2
Merge "Add compat path for restore underflow"
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index c0e253b..384bd2c 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3583,6 +3583,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
// of whether a layout was requested on that View.
sIgnoreMeasureCache = targetSdkVersion < KITKAT;
+ Canvas.sCompatibilityRestore = targetSdkVersion < MNC;
+
sCompatibilityDone = true;
}
}