Merge "Do not attempt to decode NULL SkData." into klp-dev (80a058b3) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/BitmapFactory.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,9 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi
		}

		SkAutoTUnref<SkData> data(SkData::NewFromFD(descriptor));
		if (data.get() == NULL) {
		return nullObjectReturn("NewFromFD failed in nativeDecodeFileDescriptor");
		}
		SkAutoTUnref<SkMemoryStream> stream(new SkMemoryStream(data));

		/* Allow purgeable iff we own the FD, i.e., in the puregeable and