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

Commit d34950cf authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 80b0496a: am 2db26788: am e71afc2e: Merge "Revert "Hide AssetInputStream.getAssetInt."" 

* commit '80b0496a':
  Revert "Hide AssetInputStream.getAssetInt."
parents 7f4dd912 80b0496a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7543,6 +7543,7 @@ package android.content.res { 
  public final class AssetManager.AssetInputStream extends java.io.InputStream {

    method public final int available() throws java.io.IOException;

    method public final void close() throws java.io.IOException;

    method public final int getAssetInt();

    method public final void mark(int);

    method public final boolean markSupported();

    method public final int read() throws java.io.IOException;

core/java/android/content/res/AssetManager.java

+0 −3
Original line number Diff line number Diff line
@@ -537,9 +537,6 @@ public final class AssetManager { 
    }

    

    public final class AssetInputStream extends InputStream {

        /**

         * @hide

         */

        public final int getAssetInt() {

            return mAsset;

        }