am 2000fe58: Merge "Make getAssetInt throw unconditionally."

* commit '2000fe58332dffaad34c618fe35840992cb0f571':
  Make getAssetInt throw unconditionally.
This commit is contained in:
Narayan Kamath
2014-02-27 05:15:56 -08:00
committed by Android Git Automerger

View File

@ -537,7 +537,7 @@ public final class AssetManager {
public final class AssetInputStream extends InputStream { public final class AssetInputStream extends InputStream {
public final int getAssetInt() { public final int getAssetInt() {
return (int) mAsset; throw new UnsupportedOperationException();
} }
/** /**
* @hide * @hide