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

* commit '2000fe58332dffaad34c618fe35840992cb0f571': Make getAssetInt throw unconditionally.
2014-02-27 05:15:56 -08:00
parent 59ff85af31 2000fe5833
commit f61add84c2
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@ -537,7 +537,7 @@ public final class AssetManager {
    
    public final class AssetInputStream extends InputStream {
        public final int getAssetInt() {
-            return (int) mAsset;
+            throw new UnsupportedOperationException();
        }
        /**
         * @hide