summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-02-27 13:19:15 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-27 13:19:15 +0000
commit9fc8e6fe8f6c89f5ebcda4b569cab10988e1fa3f (patch)
tree93e230d8e28ef0fff122d44f2da3d5ad58b851fa
parent71e21fec61d17b41a3f0ed817bfa2ae5fb357212 (diff)
parentf61add84c28be06c190d5594a41a7ef84b7666fe (diff)
am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe': Make getAssetInt throw unconditionally.
-rw-r--r--core/java/android/content/res/AssetManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index 418bdda3c657..9ce17e41e6d1 100644
--- 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