Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18f247a5 authored Jan 04, 2024 by Devin Moore Committed by Automerger Merge Worker Jan 04, 2024

Merge changes I98f1319d,Ic15fe28f into main am: e901af4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2895642

Change-Id: I26341eb9b4b5cc68e16ad50de4589d4562c4a460
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 159a6731 e901af4a

libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ class PersistableBundle {
		if (__builtin_available(android __ANDROID_API_V__, *)) {
		return APersistableBundle_readFromParcel(parcel, &mPBundle);
		} else {
		return STATUS_FAILED_TRANSACTION;
		return STATUS_INVALID_OPERATION;
		}
		}

		@@ -72,7 +72,7 @@ class PersistableBundle {
		if (__builtin_available(android __ANDROID_API_V__, *)) {
		return APersistableBundle_writeToParcel(mPBundle, parcel);
		} else {
		return STATUS_FAILED_TRANSACTION;
		return STATUS_INVALID_OPERATION;
		}
		}

libs/nativewindow/include/android/native_window_aidl.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public:
		if (__builtin_available(android __ANDROID_API_U__, *)) {
		return ANativeWindow_readFromParcel(parcel, &mWindow);
		} else {
		return STATUS_FAILED_TRANSACTION;
		return STATUS_INVALID_OPERATION;
		}
		}

		@@ -111,7 +111,7 @@ public:
		if (__builtin_available(android __ANDROID_API_U__, *)) {
		return ANativeWindow_writeToParcel(mWindow, parcel);
		} else {
		return STATUS_FAILED_TRANSACTION;
		return STATUS_INVALID_OPERATION;
		}
		}