From a1dcc992ffedb9a44f2072a8100eed15a7ca93b2 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@google.com>
Date: Tue, 27 Nov 2012 13:35:49 -0800
Subject: [PATCH] Undeprecate linear text API

Hardware renderer support pending, but this API should not have
been deprecated in the first place.

Change-Id: I062dac6d65dffb5369e65d55ea159594a0971b59
---
 api/current.txt                           | 4 ++--
 graphics/java/android/graphics/Paint.java | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index e46f90f9f712b..ec3aa89fd76ef 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8772,7 +8772,7 @@ package android.graphics {
     method public final boolean isDither();
     method public final boolean isFakeBoldText();
     method public final boolean isFilterBitmap();
-    method public final deprecated boolean isLinearText();
+    method public final boolean isLinearText();
     method public final boolean isStrikeThruText();
     method public final boolean isSubpixelText();
     method public final boolean isUnderlineText();
@@ -8792,7 +8792,7 @@ package android.graphics {
     method public void setFilterBitmap(boolean);
     method public void setFlags(int);
     method public void setHinting(int);
-    method public deprecated void setLinearText(boolean);
+    method public void setLinearText(boolean);
     method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
     method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
     method public android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
index 4170cfe72f485..3285e518c9201 100644
--- a/graphics/java/android/graphics/Paint.java
+++ b/graphics/java/android/graphics/Paint.java
@@ -553,7 +553,6 @@ public class Paint {
      *
      * @return true if the lineartext bit is set in the paint's flags
      */
-    @Deprecated
     public final boolean isLinearText() {
         return (getFlags() & LINEAR_TEXT_FLAG) != 0;
     }
@@ -564,7 +563,6 @@ public class Paint {
      * @param linearText true to set the linearText bit in the paint's flags,
      *                   false to clear it.
      */
-    @Deprecated
     public native void setLinearText(boolean linearText);
 
     /**