Snap for 12644741 from 225c2c825e2a8f18ea98f077db72d25715ae62f4 to 25Q1-release (921762ca) · Commits · e / os / android_frameworks_native

include/input/InputConsumerNoResampling.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ private:
		}

		private:
		std::function<int(int events)> mCallback;
		const std::function<int(int events)> mCallback;
		};
		sp<LooperEventCallback> mCallback;
		/**

include/input/InputDevice.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -131,8 +131,9 @@ enum class InputDeviceLightType : int32_t {
		PLAYER_ID = 1,
		KEYBOARD_BACKLIGHT = 2,
		KEYBOARD_MIC_MUTE = 3,
		KEYBOARD_VOLUME_MUTE = 4,

		ftl_last = KEYBOARD_MIC_MUTE
		ftl_last = KEYBOARD_VOLUME_MUTE
		};

		enum class InputDeviceLightCapability : uint32_t {

libs/binder/ndk/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ cc_library {

		llndk: {
		symbol_file: "libbinder_ndk.map.txt",
		export_llndk_headers: ["libvendorsupport_llndk_headers"],
		},

		cflags: [
		@@ -110,11 +109,9 @@ cc_library {
		],

		header_libs: [
		"libvendorsupport_llndk_headers",
		"jni_headers",
		],
		export_header_lib_headers: [
		"libvendorsupport_llndk_headers",
		"jni_headers",
		],

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

+7 −10

Original line number	Diff line number	Diff line
		@@ -30,16 +30,14 @@
		#include <android/binder_auto_utils.h>
		#include <android/binder_ibinder.h>

		#if defined(__ANDROID_VENDOR_API__)
		#include <android/llndk-versioning.h>
		#elif !defined(API_LEVEL_AT_LEAST)
		#if defined(__BIONIC__)
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
		(__builtin_available(android sdk_api_level, *))
		#define API_LEVEL_AT_LEAST(sdk_api_level) __builtin_available(android sdk_api_level, *)
		#elif defined(TRUSTY_USERSPACE)
		// TODO(b/349936395): set to true for Trusty
		#define API_LEVEL_AT_LEAST(sdk_api_level) (false)
		#else
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
		#define API_LEVEL_AT_LEAST(sdk_api_level) (true)
		#endif // __BIONIC__
		#endif // __ANDROID_VENDOR_API__

		#if __has_include(<android/binder_shell.h>)
		#include <android/binder_shell.h>
		@@ -298,9 +296,8 @@ AIBinder_Class* ICInterface::defineClass(const char* interfaceDescriptor,
		#endif

		#if defined(__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__) \|\| __ANDROID_API__ >= 36
		if API_LEVEL_AT_LEAST (36, 202504) {
		if (codeToFunction != nullptr &&
		(&AIBinder_Class_setTransactionCodeToFunctionNameMap != nullptr)) {
		if (API_LEVEL_AT_LEAST(36)) {
		if (codeToFunction != nullptr) {
		AIBinder_Class_setTransactionCodeToFunctionNameMap(clazz, codeToFunction,
		functionCount);
		}

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

+49 −52

Original line number	Diff line number	Diff line
		@@ -22,17 +22,14 @@
		#include <set>
		#include <sstream>

		// Include llndk-versioning.h only for non-system build as it is not available for NDK headers.
		#if defined(__ANDROID_VENDOR_API__)
		#include <android/llndk-versioning.h>
		#elif !defined(API_LEVEL_AT_LEAST)
		#if defined(__BIONIC__)
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
		(__builtin_available(android sdk_api_level, *))
		#define API_LEVEL_AT_LEAST(sdk_api_level) __builtin_available(android sdk_api_level, *)
		#elif defined(TRUSTY_USERSPACE)
		// TODO(b/349936395): set to true for Trusty
		#define API_LEVEL_AT_LEAST(sdk_api_level) (false)
		#else
		#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
		#define API_LEVEL_AT_LEAST(sdk_api_level) (true)
		#endif // __BIONIC__
		#endif // __ANDROID_VENDOR_API__

		namespace aidl::android::os {

		@@ -44,7 +41,7 @@ namespace aidl::android::os {
		class PersistableBundle {
		public:
		PersistableBundle() noexcept {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		mPBundle = APersistableBundle_new();
		}
		}
		@@ -54,13 +51,13 @@ class PersistableBundle {
		PersistableBundle(PersistableBundle&& other) noexcept : mPBundle(other.release()) {}
		// duplicates, does not take ownership of the APersistableBundle*
		PersistableBundle(const PersistableBundle& other) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		mPBundle = APersistableBundle_dup(other.mPBundle);
		}
		}
		// duplicates, does not take ownership of the APersistableBundle*
		PersistableBundle& operator=(const PersistableBundle& other) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		mPBundle = APersistableBundle_dup(other.mPBundle);
		}
		return *this;
		@@ -70,7 +67,7 @@ class PersistableBundle {

		binder_status_t readFromParcel(const AParcel* _Nonnull parcel) {
		reset();
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_readFromParcel(parcel, &mPBundle);
		} else {
		return STATUS_INVALID_OPERATION;
		@@ -81,7 +78,7 @@ class PersistableBundle {
		if (!mPBundle) {
		return STATUS_BAD_VALUE;
		}
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_writeToParcel(mPBundle, parcel);
		} else {
		return STATUS_INVALID_OPERATION;
		@@ -96,7 +93,7 @@ class PersistableBundle {
		*/
		void reset(APersistableBundle* _Nullable pBundle = nullptr) noexcept {
		if (mPBundle) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_delete(mPBundle);
		}
		mPBundle = nullptr;
		@@ -109,7 +106,7 @@ class PersistableBundle {
		* what should be used to check for equality.
		*/
		bool deepEquals(const PersistableBundle& rhs) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_isEqual(get(), rhs.get());
		} else {
		return false;
		@@ -148,7 +145,7 @@ class PersistableBundle {
		inline std::string toString() const {
		if (!mPBundle) {
		return "<PersistableBundle: null>";
		} else if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		} else if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		std::ostringstream os;
		os << "<PersistableBundle: ";
		os << "size: " << std::to_string(APersistableBundle_size(mPBundle));
		@@ -159,7 +156,7 @@ class PersistableBundle {
		}

		int32_t size() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_size(mPBundle);
		} else {
		return 0;
		@@ -167,7 +164,7 @@ class PersistableBundle {
		}

		int32_t erase(const std::string& key) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_erase(mPBundle, key.c_str());
		} else {
		return 0;
		@@ -175,37 +172,37 @@ class PersistableBundle {
		}

		void putBoolean(const std::string& key, bool val) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putBoolean(mPBundle, key.c_str(), val);
		}
		}

		void putInt(const std::string& key, int32_t val) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putInt(mPBundle, key.c_str(), val);
		}
		}

		void putLong(const std::string& key, int64_t val) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putLong(mPBundle, key.c_str(), val);
		}
		}

		void putDouble(const std::string& key, double val) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putDouble(mPBundle, key.c_str(), val);
		}
		}

		void putString(const std::string& key, const std::string& val) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putString(mPBundle, key.c_str(), val.c_str());
		}
		}

		void putBooleanVector(const std::string& key, const std::vector<bool>& vec) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		// std::vector<bool> has no ::data().
		int32_t num = vec.size();
		if (num > 0) {
		@@ -222,7 +219,7 @@ class PersistableBundle {
		}

		void putIntVector(const std::string& key, const std::vector<int32_t>& vec) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t num = vec.size();
		if (num > 0) {
		APersistableBundle_putIntVector(mPBundle, key.c_str(), vec.data(), num);
		@@ -230,7 +227,7 @@ class PersistableBundle {
		}
		}
		void putLongVector(const std::string& key, const std::vector<int64_t>& vec) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t num = vec.size();
		if (num > 0) {
		APersistableBundle_putLongVector(mPBundle, key.c_str(), vec.data(), num);
		@@ -238,7 +235,7 @@ class PersistableBundle {
		}
		}
		void putDoubleVector(const std::string& key, const std::vector<double>& vec) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t num = vec.size();
		if (num > 0) {
		APersistableBundle_putDoubleVector(mPBundle, key.c_str(), vec.data(), num);
		@@ -246,7 +243,7 @@ class PersistableBundle {
		}
		}
		void putStringVector(const std::string& key, const std::vector<std::string>& vec) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t num = vec.size();
		if (num > 0) {
		char inVec = (char)malloc(num * sizeof(char*));
		@@ -261,13 +258,13 @@ class PersistableBundle {
		}
		}
		void putPersistableBundle(const std::string& key, const PersistableBundle& pBundle) {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle_putPersistableBundle(mPBundle, key.c_str(), pBundle.mPBundle);
		}
		}

		bool getBoolean(const std::string& key, bool* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_getBoolean(mPBundle, key.c_str(), val);
		} else {
		return false;
		@@ -275,7 +272,7 @@ class PersistableBundle {
		}

		bool getInt(const std::string& key, int32_t* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_getInt(mPBundle, key.c_str(), val);
		} else {
		return false;
		@@ -283,7 +280,7 @@ class PersistableBundle {
		}

		bool getLong(const std::string& key, int64_t* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_getLong(mPBundle, key.c_str(), val);
		} else {
		return false;
		@@ -291,7 +288,7 @@ class PersistableBundle {
		}

		bool getDouble(const std::string& key, double* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return APersistableBundle_getDouble(mPBundle, key.c_str(), val);
		} else {
		return false;
		@@ -303,7 +300,7 @@ class PersistableBundle {
		}

		bool getString(const std::string& key, std::string* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		char* outString = nullptr;
		bool ret = APersistableBundle_getString(mPBundle, key.c_str(), &outString,
		&stringAllocator, nullptr);
		@@ -321,7 +318,7 @@ class PersistableBundle {
		const char* _Nonnull, T* _Nullable, int32_t),
		const APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		std::vector<T>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t bytes = 0;
		// call first with nullptr to get required size in bytes
		bytes = getVec(pBundle, key, nullptr, 0);
		@@ -343,28 +340,28 @@ class PersistableBundle {
		}

		bool getBooleanVector(const std::string& key, std::vector<bool>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getVecInternal<bool>(&APersistableBundle_getBooleanVector, mPBundle, key.c_str(),
		vec);
		}
		return false;
		}
		bool getIntVector(const std::string& key, std::vector<int32_t>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getVecInternal<int32_t>(&APersistableBundle_getIntVector, mPBundle, key.c_str(),
		vec);
		}
		return false;
		}
		bool getLongVector(const std::string& key, std::vector<int64_t>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getVecInternal<int64_t>(&APersistableBundle_getLongVector, mPBundle, key.c_str(),
		vec);
		}
		return false;
		}
		bool getDoubleVector(const std::string& key, std::vector<double>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getVecInternal<double>(&APersistableBundle_getDoubleVector, mPBundle,
		key.c_str(), vec);
		}
		@@ -389,7 +386,7 @@ class PersistableBundle {
		}

		bool getStringVector(const std::string& key, std::vector<std::string>* _Nonnull vec) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		int32_t bytes = APersistableBundle_getStringVector(mPBundle, key.c_str(), nullptr, 0,
		&stringAllocator, nullptr);
		if (bytes > 0) {
		@@ -406,7 +403,7 @@ class PersistableBundle {
		}

		bool getPersistableBundle(const std::string& key, PersistableBundle* _Nonnull val) const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		APersistableBundle* bundle = nullptr;
		bool ret = APersistableBundle_getPersistableBundle(mPBundle, key.c_str(), &bundle);
		if (ret) {
		@@ -438,77 +435,77 @@ class PersistableBundle {
		}

		std::set<std::string> getBooleanKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getBooleanKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getIntKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getIntKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getLongKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getLongKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getDoubleKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getDoubleKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getStringKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getStringKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getBooleanVectorKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getBooleanVectorKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getIntVectorKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getIntVectorKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getLongVectorKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getLongVectorKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getDoubleVectorKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getDoubleVectorKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getStringVectorKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getStringVectorKeys, mPBundle);
		} else {
		return {};
		}
		}
		std::set<std::string> getPersistableBundleKeys() const {
		if API_LEVEL_AT_LEAST(__ANDROID_API_V__, 202404) {
		if (API_LEVEL_AT_LEAST(__ANDROID_API_V__)) {
		return getKeys(&APersistableBundle_getPersistableBundleKeys, mPBundle);
		} else {
		return {};