Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5294ed5 authored by Tim Murray's avatar Tim Murray Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP."

parents 3fb6feac 0e3431d4

api/current.txt

+8 −11
Original line number Diff line number Diff line
@@ -21794,7 +21794,7 @@ package android.renderscript { 
  }















  public class BaseObj {













    method public synchronized void destroy();













    method public void destroy();















    method public java.lang.String getName();















    method public void setName(java.lang.String);















  }










@@ -22518,9 +22518,6 @@ package android.renderscript {













  }





























  public class Type extends android.renderscript.BaseObj {













    method public static android.renderscript.Type createX(android.renderscript.RenderScript, android.renderscript.Element, int);













    method public static android.renderscript.Type createXY(android.renderscript.RenderScript, android.renderscript.Element, int, int);













    method public static android.renderscript.Type createXYZ(android.renderscript.RenderScript, android.renderscript.Element, int, int, int);















    method public int getCount();















    method public android.renderscript.Element getElement();















    method public int getX();










@@ -42723,11 +42720,11 @@ package java.util.concurrent {













  }





























  public class ConcurrentHashMap extends java.util.AbstractMap implements java.util.concurrent.ConcurrentMap java.io.Serializable {













    ctor public ConcurrentHashMap(int, float, int);













    ctor public ConcurrentHashMap(int, float);













    ctor public ConcurrentHashMap(int);















    ctor public ConcurrentHashMap();













    ctor public ConcurrentHashMap(int);















    ctor public ConcurrentHashMap(java.util.Map<? extends K, ? extends V>);













    ctor public ConcurrentHashMap(int, float);













    ctor public ConcurrentHashMap(int, float, int);















    method public boolean contains(java.lang.Object);















    method public java.util.Enumeration<V> elements();















    method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();










@@ -44167,12 +44164,12 @@ package java.util.regex {













  public final class Matcher implements java.util.regex.MatchResult {















    method public java.util.regex.Matcher appendReplacement(java.lang.StringBuffer, java.lang.String);















    method public java.lang.StringBuffer appendTail(java.lang.StringBuffer);













    method public int end(int);















    method public int end();













    method public int end(int);















    method public boolean find(int);















    method public boolean find();













    method public java.lang.String group(int);















    method public java.lang.String group();













    method public java.lang.String group(int);















    method public int groupCount();















    method public boolean hasAnchoringBounds();















    method public boolean hasTransparentBounds();









@@ -44189,8 +44186,8 @@ package java.util.regex {













    method public boolean requireEnd();















    method public java.util.regex.Matcher reset();















    method public java.util.regex.Matcher reset(java.lang.CharSequence);













    method public int start(int) throws java.lang.IllegalStateException;















    method public int start();













    method public int start(int) throws java.lang.IllegalStateException;















    method public java.util.regex.MatchResult toMatchResult();















    method public java.util.regex.Matcher useAnchoringBounds(boolean);















    method public java.util.regex.Matcher usePattern(java.util.regex.Pattern);










@@ -50931,7 +50928,7 @@ package org.json {













    method public java.lang.String getString(java.lang.String) throws org.json.JSONException;















    method public boolean has(java.lang.String);















    method public boolean isNull(java.lang.String);













    method public java.util.Iterator keys();













    method public java.util.Iterator<java.lang.String> keys();















    method public int length();















    method public org.json.JSONArray names();















    method public static java.lang.String numberToString(java.lang.Number) throws org.json.JSONException;

























rs/java/android/renderscript/Type.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -218,6 +218,7 @@ public class Type extends BaseObj {













    }































    /**













     * @hide















     * Utility function for creating basic 1D types. The type is















     * created without mipmaps enabled.















     *









@@ -241,6 +242,7 @@ public class Type extends BaseObj {













    }































    /**













     * @hide















     * Utility function for creating basic 2D types. The type is















     * created without mipmaps or cubemaps.















     *









@@ -266,6 +268,7 @@ public class Type extends BaseObj {













    }































    /**













     * @hide















     * Utility function for creating basic 3D types. The type is















     * created without mipmaps.















     *