summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2015-06-22 15:38:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-22 15:38:11 +0000
commitb2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c (patch)
tree035fbfffb50661ef345e8b3122d721f618ee0564 /graphics
parent616f035bc9a2d9855feb2348d2b732a18ebdbffb (diff)
parente109940d81cc67fcdb2e2bbb79dce9039ead86c6 (diff)
downloadframeworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.zip
frameworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.tar.gz
frameworks_base-b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c.tar.bz2
Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Picture.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java
index 39272b9..0e55089 100644
--- a/graphics/java/android/graphics/Picture.java
+++ b/graphics/java/android/graphics/Picture.java
@@ -135,8 +135,8 @@ public class Picture {
* properly and are highly discouraged.
*
* <p>
- * <strong>Note:</strong> a picture created from an input stream cannot be
- * replayed on a hardware accelerated canvas.
+ * <strong>Note:</strong> Prior to API level 23 a picture created from an
+ * input stream cannot be replayed on a hardware accelerated canvas.
*
* @see #writeToStream(java.io.OutputStream)
* @deprecated The recommended alternative is to not use writeToStream and
@@ -155,8 +155,8 @@ public class Picture {
* there is no guarantee that the Picture can be successfully reconstructed.
*
* <p>
- * <strong>Note:</strong> a picture created from an input stream cannot be
- * replayed on a hardware accelerated canvas.
+ * <strong>Note:</strong> Prior to API level 23 a picture created from an
+ * input stream cannot be replayed on a hardware accelerated canvas.
*
* @see #createFromStream(java.io.InputStream)
* @deprecated The recommended alternative is to draw the picture into a