From cf0806108d587dcb9cd24f3b39df0bcf6837e07f Mon Sep 17 00:00:00 2001
From: Leon Scroggins III <scroggo@google.com>
Date: Fri, 1 May 2020 15:39:16 -0400
Subject: [PATCH] Remove/document @hidden APIs in Canvas

Bug: 155422223
Test: make

For Canvas to be in a mainline module, it cannot be have @hidden APIs
accessed from outside the module. Remove @hide where simple:

- document why Canvas(long) is needed to be public + @hide
  - remove its UnsupportedAppUsage, which was a false positive
- remove EdgeType.nativeInt (which was @hide) - no longer used
- make VertexMode.nativeInt package protected

Change-Id: I508758889c586f336c2963e1b61d01dc3dc58be7
---
 graphics/java/android/graphics/Canvas.java | 24 +++++++---------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java
index d949444d44d62..2a4a411c46bab 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -124,8 +124,10 @@ public class Canvas extends BaseCanvas {
         mDensity = bitmap.mDensity;
     }
 
-    /** @hide */
-    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
+    /**
+     *  @hide Needed by android.graphics.pdf.PdfDocument, but should not be called from
+     *  outside the UI rendering module.
+     */
     public Canvas(long nativeCanvas) {
         if (nativeCanvas == 0) {
             throw new IllegalStateException();
@@ -1169,21 +1171,12 @@ public class Canvas extends BaseCanvas {
         /**
          * Black-and-White: Treat edges by just rounding to nearest pixel boundary
          */
-        BW(0),  //!< treat edges by just rounding to nearest pixel boundary
+        BW,
 
         /**
          * Antialiased: Treat edges by rounding-out, since they may be antialiased
          */
-        AA(1);
-
-        EdgeType(int nativeInt) {
-            this.nativeInt = nativeInt;
-        }
-
-        /**
-         * @hide
-         */
-        public final int nativeInt;
+        AA;
     }
 
     /**
@@ -1386,10 +1379,7 @@ public class Canvas extends BaseCanvas {
             this.nativeInt = nativeInt;
         }
 
-        /**
-         * @hide
-         */
-        public final int nativeInt;
+        /*package*/ final int nativeInt;
     }
 
     /**