summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-27 13:13:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-27 13:13:08 +0000
commit2000fe58332dffaad34c618fe35840992cb0f571 (patch)
tree545d271f841cd052d24919759cae95003722e457 /core/java
parent2729857df6c559b37248c96b78303b662212d14b (diff)
parent2d19d202bdf6c16b8e01b73f3a742b2670bff907 (diff)
Merge "Make getAssetInt throw unconditionally."
Diffstat (limited to 'core/java')
-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