Snap for 6188643 from 415974ebae005add7f781f468c8ae8a02f1b1e2c to rvc-release (2aae8da0) · Commits · e / os / android_frameworks_native-old

PREUPLOAD.cfg

+1 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
		include/input/
		libs/binder/fuzzer/
		libs/binder/ndk/
		libs/binderthreadstate/
		libs/graphicsenv/
		libs/gui/
		libs/input/

+3 −4

Original line number	Diff line number	Diff line
		@@ -1102,7 +1102,7 @@ binder::Status InstalldNativeService::destroyAppDataSnapshot(
		binder::Status InstalldNativeService::moveCompleteApp(const std::unique_ptr<std::string>& fromUuid,
		const std::unique_ptr<std::string>& toUuid, const std::string& packageName,
		const std::string& dataAppName, int32_t appId, const std::string& seInfo,
		int32_t targetSdkVersion) {
		int32_t targetSdkVersion, const std::string& fromCodePath) {
		ENFORCE_UID(AID_SYSTEM);
		CHECK_ARGUMENT_UUID(fromUuid);
		CHECK_ARGUMENT_UUID(toUuid);
		@@ -1119,13 +1119,12 @@ binder::Status InstalldNativeService::moveCompleteApp(const std::unique_ptr<std:

		// Copy app
		{
		auto from = create_data_app_package_path(from_uuid, data_app_name);
		auto to = create_data_app_package_path(to_uuid, data_app_name);
		auto to_parent = create_data_app_path(to_uuid);

		int rc = copy_directory_recursive(from.c_str(), to_parent.c_str());
		int rc = copy_directory_recursive(fromCodePath.c_str(), to_parent.c_str());
		if (rc != 0) {
		res = error(rc, "Failed copying " + from + " to " + to);
		res = error(rc, "Failed copying " + fromCodePath + " to " + to);
		goto fail;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ public:
		binder::Status moveCompleteApp(const std::unique_ptr<std::string>& fromUuid,
		const std::unique_ptr<std::string>& toUuid, const std::string& packageName,
		const std::string& dataAppName, int32_t appId, const std::string& seInfo,
		int32_t targetSdkVersion);
		int32_t targetSdkVersion, const std::string& fromCodePath);

		binder::Status dexopt(const std::string& apkPath, int32_t uid,
		const std::unique_ptr<std::string>& packageName, const std::string& instructionSet,

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ interface IInstalld {

		void moveCompleteApp(@nullable @utf8InCpp String fromUuid, @nullable @utf8InCpp String toUuid,
		@utf8InCpp String packageName, @utf8InCpp String dataAppName, int appId,
		@utf8InCpp String seInfo, int targetSdkVersion);
		@utf8InCpp String seInfo, int targetSdkVersion, @utf8InCpp String fromCodePath);

		void dexopt(@utf8InCpp String apkPath, int uid, @nullable @utf8InCpp String packageName,
		@utf8InCpp String instructionSet, int dexoptNeeded,

+11 −5

Original line number	Diff line number	Diff line
		@@ -97,15 +97,21 @@ typedef struct {
		uint32_t stride;
		/** The bitmap pixel format. See {@link AndroidBitmapFormat} */
		int32_t format;
		/** Two bits are used to encode alpha. Use ANDROID_BITMAP_FLAGS_ALPHA_MASK
		* and ANDROID_BITMAP_FLAGS_ALPHA_SHIFT to retrieve them. One bit is used
		* to encode whether the Bitmap uses the HARDWARE Config. Use
		* ANDROID_BITMAP_FLAGS_IS_HARDWARE to know.*/
		/** Bitfield containing information about the bitmap.
		*
		* <p>Two bits are used to encode alpha. Use {@link ANDROID_BITMAP_FLAGS_ALPHA_MASK}
		* and {@link ANDROID_BITMAP_FLAGS_ALPHA_SHIFT} to retrieve them.</p>
		*
		* <p>One bit is used to encode whether the Bitmap uses the HARDWARE Config. Use
		* {@link ANDROID_BITMAP_FLAGS_IS_HARDWARE} to know.</p>
		*
		* <p>These flags were introduced in API level 30.</p>
		*/
		uint32_t flags;
		} AndroidBitmapInfo;

		/**
		* Given a java bitmap object, fill out the AndroidBitmapInfo struct for it.
		* Given a java bitmap object, fill out the {@link AndroidBitmapInfo} struct for it.
		* If the call fails, the info parameter will be ignored.
		*/
		int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,