summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-09-11 18:27:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-11 18:28:07 +0000
commit2cad64c0fbeba07bb546674e19cfb0166d7ec332 (patch)
tree7ec5d5625c648ea459f4c4ec17917dae633e26f2 /core/jni
parent444ae3a2e66b4404fa715ab46403da09079dd572 (diff)
parenta86ab640f7bb0bf3cb4eaed80473ca8c5d131903 (diff)
downloadframeworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.zip
frameworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.tar.gz
frameworks_base-2cad64c0fbeba07bb546674e19cfb0166d7ec332.tar.bz2
Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android/graphics/SurfaceTexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
index bacfdf6..0c9b3bc 100644
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -37,7 +37,7 @@
namespace android {
static const char* const OutOfResourcesException =
- "android/graphics/SurfaceTexture$OutOfResourcesException";
+ "android/view/Surface$OutOfResourcesException";
static const char* const IllegalStateException = "java/lang/IllegalStateException";
const char* const kSurfaceTextureClassPathName = "android/graphics/SurfaceTexture";