From a74879d25eb0e4ef53855b57181b038bca75d05f Mon Sep 17 00:00:00 2001
From: Bill Peckham <bpeckham@google.com>
Date: Sat, 8 Sep 2018 10:06:40 -0700
Subject: Merge QP1A.180823.001

Change-Id: Ia2d6fa811b3c57185c1975db603d59e6eaef73fc
---
 rs/java/android/renderscript/ProgramVertexFixedFunction.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')

diff --git a/rs/java/android/renderscript/ProgramVertexFixedFunction.java b/rs/java/android/renderscript/ProgramVertexFixedFunction.java
index 45840aee04a5..579d3bb507e8 100644
--- a/rs/java/android/renderscript/ProgramVertexFixedFunction.java
+++ b/rs/java/android/renderscript/ProgramVertexFixedFunction.java
@@ -16,6 +16,8 @@
 
 package android.renderscript;
 
+import android.annotation.UnsupportedAppUsage;
+
 
 /**
  * @hide
@@ -38,6 +40,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
      *
      * @param va allocation containing fixed function matrices
      */
+    @UnsupportedAppUsage
     public void bindConstants(Constants va) {
         mRS.validate();
         bindConstants(va.getAllocation(), 0);
@@ -118,6 +121,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
          *
          * @param rs Context to which the program will belong.
          */
+        @UnsupportedAppUsage
         public Builder(RenderScript rs) {
             mRS = rs;
         }
@@ -170,6 +174,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
          *
          * @return Fixed function emulation ProgramVertex
          */
+        @UnsupportedAppUsage
         public ProgramVertexFixedFunction create() {
             buildShaderString();
 
@@ -215,6 +220,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
         *
         * @param rs Context to which the allocation will belong.
         **/
+        @UnsupportedAppUsage
         public Constants(RenderScript rs) {
             Type constInputType = ProgramVertexFixedFunction.Builder.getConstantInputType(rs);
             mAlloc = Allocation.createTyped(rs, constInputType);
@@ -268,6 +274,7 @@ public class ProgramVertexFixedFunction extends ProgramVertex {
         *
         * @param m projection matrix
         */
+        @UnsupportedAppUsage
         public void setProjection(Matrix4f m) {
             mProjection.load(m);
             addToBuffer(PROJECTION_OFFSET*4, m);
-- 
cgit v1.2.3