Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev (3c8bde55) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@ private:
		env->ExceptionDescribe();
		env->ExceptionClear();
		SkDebugf("---- read threw an exception\n");
		// Consider the stream to be at the end, since there was an error.
		fIsAtEnd = true;
		return 0;
		}

		@@ -92,6 +94,9 @@ private:
		env->ExceptionDescribe();
		env->ExceptionClear();
		SkDebugf("---- read:GetByteArrayRegion threw an exception\n");
		// The error was not with the stream itself, but consider it to be at the
		// end, since we do not have a way to recover.
		fIsAtEnd = true;
		return 0;
		}