Merge "No need to std::move local variable to return value" into main (608316b4) · Commits · e / os / android_frameworks_base

libs/androidfw/Asset.cpp

+2 −4

Original line number	Diff line number	Diff line
		@@ -309,9 +309,8 @@ Asset::Asset(void)
		return NULL;
		}

		// We succeeded, so relinquish control of dataMap
		pAsset->mAccessMode = mode;
		return std::move(pAsset);
		return pAsset;
		}

		/*
		@@ -328,9 +327,8 @@ Asset::Asset(void)
		return NULL;
		}

		// We succeeded, so relinquish control of dataMap
		pAsset->mAccessMode = mode;
		return std::move(pAsset);
		return pAsset;
		}

		/*