From ba038689b1cd96cd3c1c83d9cf1219bff5bb518d Mon Sep 17 00:00:00 2001
From: David Gross <dgross@google.com>
Date: Fri, 22 Jan 2016 14:33:15 -0800
Subject: [PATCH] Unhide Script::reduce() interface for general reduction.

Bug: 23535724

Change-Id: I7a43622954de9f4168f7e4376f39d6ec54191c03
---
 api/current.txt                          | 1 +
 api/system-current.txt                   | 1 +
 api/test-current.txt                     | 1 +
 rs/java/android/renderscript/Script.java | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 729f4da56b6e1..5c43d7d258640 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -32801,6 +32801,7 @@ package android.renderscript {
     method public void getVarV(int, android.renderscript.FieldPacker);
     method protected void invoke(int);
     method protected void invoke(int, android.renderscript.FieldPacker);
+    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
     method public void setTimeZone(java.lang.String);
     method public void setVar(int, float);
     method public void setVar(int, double);
diff --git a/api/system-current.txt b/api/system-current.txt
index da83f6a012a60..b1f3b1f511868 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -34989,6 +34989,7 @@ package android.renderscript {
     method public void getVarV(int, android.renderscript.FieldPacker);
     method protected void invoke(int);
     method protected void invoke(int, android.renderscript.FieldPacker);
+    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
     method public void setTimeZone(java.lang.String);
     method public void setVar(int, float);
     method public void setVar(int, double);
diff --git a/api/test-current.txt b/api/test-current.txt
index 4193cadd2ab6e..be252edff1902 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -32815,6 +32815,7 @@ package android.renderscript {
     method public void getVarV(int, android.renderscript.FieldPacker);
     method protected void invoke(int);
     method protected void invoke(int, android.renderscript.FieldPacker);
+    method protected void reduce(int, android.renderscript.Allocation[], android.renderscript.Allocation, android.renderscript.Script.LaunchOptions);
     method public void setTimeZone(java.lang.String);
     method public void setVar(int, float);
     method public void setVar(int, double);
diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java
index 84f980dc24cde..2b0678046e324 100644
--- a/rs/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
@@ -315,7 +315,6 @@ public class Script extends BaseObj {
     /**
      * Only intended for use by generated reflected code.  (General reduction)
      *
-     * @hide
      */
     protected void reduce(int slot, Allocation[] ains, Allocation aout, LaunchOptions sc) {
         mRS.validate();