diff options
| author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:16:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:16:17 +0000 |
| commit | 9a25b94430905d512add055deac34bfa103bbd4e (patch) | |
| tree | c76c23ac21f8312ca8968f1b2bb9072d085cd251 /core/java/android/content | |
| parent | 71be6865b9b7a298ccb5c2dcc57754ed6e228ccf (diff) | |
| parent | f61add84c28be06c190d5594a41a7ef84b7666fe (diff) | |
| download | frameworks_base-9a25b94430905d512add055deac34bfa103bbd4e.zip frameworks_base-9a25b94430905d512add055deac34bfa103bbd4e.tar.gz frameworks_base-9a25b94430905d512add055deac34bfa103bbd4e.tar.bz2 | |
am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally."
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
Make getAssetInt throw unconditionally.
Diffstat (limited to 'core/java/android/content')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 2 |
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 418bdda..9ce17e4 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 |