Merge "Fix gainmap build warning." (6358897a) · Commits · e / os / android_frameworks_base

libs/hwui/jni/Bitmap.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ static jobject Bitmap_copy(JNIEnv* env, jobject, jlong srcHandle, jint dstConfig
		return NULL;
		}
		gainmap->bitmap = std::move(skBitmap);
		bitmap->setGainmap(std::move(gainmap.get()));
		bitmap->setGainmap(std::move(gainmap));
		}
		return createBitmap(env, bitmap.release(), getPremulBitmapCreateFlags(isMutable));
		}
		@@ -421,7 +421,7 @@ static jobject Bitmap_copy(JNIEnv* env, jobject, jlong srcHandle, jint dstConfig
		return NULL;
		}
		gainmap->bitmap = sk_sp<Bitmap>(destAllocator.getStorageObjAndReset());
		bitmap->setGainmap(std::move(gainmap.get()));
		bitmap->setGainmap(std::move(gainmap));
		}
		return createBitmap(env, bitmap, getPremulBitmapCreateFlags(isMutable));
		}