diff options
| author | Romain Guy <romainguy@android.com> | 2012-07-27 15:54:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-27 15:54:30 -0700 |
| commit | a0aa479c0eadd446dc9159195c175e3a5fe083c0 (patch) | |
| tree | 3c35bdcf6d7298fb0e0a1dd871cdacbcfbd45854 /core/jni/android/graphics | |
| parent | fbf30896653b7a3eb09ea110b1ef4c21c1059977 (diff) | |
| parent | 97e270721bf29d25b513c1f2be71a8543d048f5d (diff) | |
| download | frameworks_base-a0aa479c0eadd446dc9159195c175e3a5fe083c0.zip frameworks_base-a0aa479c0eadd446dc9159195c175e3a5fe083c0.tar.gz frameworks_base-a0aa479c0eadd446dc9159195c175e3a5fe083c0.tar.bz2 | |
am 97e27072: am dfac68ea: Merge "Corrected typo when checking InputStream methods"
* commit '97e270721bf29d25b513c1f2be71a8543d048f5d':
Corrected typo when checking InputStream methods
Diffstat (limited to 'core/jni/android/graphics')
| -rw-r--r-- | core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp index 6ce3f51..aa4cbde 100644 --- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp +++ b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp @@ -164,7 +164,7 @@ SkStream* CreateJavaInputStreamAdaptor(JNIEnv* env, jobject stream, RETURN_NULL_IF_NULL(gInputStream_resetMethodID); RETURN_NULL_IF_NULL(gInputStream_markMethodID); RETURN_NULL_IF_NULL(gInputStream_availableMethodID); - RETURN_NULL_IF_NULL(gInputStream_availableMethodID); + RETURN_NULL_IF_NULL(gInputStream_readMethodID); RETURN_NULL_IF_NULL(gInputStream_skipMethodID); gInited = true; |