Snap for 5184694 from dac84c12fcd90a770630666d56881f6ada419116 to qt-release (7babab7b) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2054,6 +2054,7 @@ static inline const char* ModeToString(Dumpstate::BugreportMode mode) {
	}		}

	static void SetOptionsFromMode(Dumpstate::BugreportMode mode, Dumpstate::DumpOptions* options) {		static void SetOptionsFromMode(Dumpstate::BugreportMode mode, Dumpstate::DumpOptions* options) {
			options->extra_options = ModeToString(mode);
	switch (mode) {		switch (mode) {
	case Dumpstate::BugreportMode::BUGREPORT_FULL:		case Dumpstate::BugreportMode::BUGREPORT_FULL:
	options->do_broadcast = true;		options->do_broadcast = true;

include/android/multinetwork.h

+41 −0

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,47 @@ int android_getaddrinfofornetwork(net_handle_t network,

	#endif /* __ANDROID_API__ >= 23 */		#endif /* __ANDROID_API__ >= 23 */

			#if __ANDROID_API__ >= 29

			/**
			* Look up the {\|ns_class\|, \|ns_type\|} Resource Record (RR) associated
			* with Domain Name \|dname\| on the given \|network\|.
			* The typical value for \|ns_class\| is ns_c_in, while \|type\| can be any
			* record type (for instance, ns_t_aaaa or ns_t_txt).
			*
			* Returns a file descriptor to watch for read events, or a negative
			* POSIX error code (see errno.h) if an immediate error occurs.
			*/
			int android_res_nquery(net_handle_t network,
			const char *dname, int ns_class, int ns_type) __INTRODUCED_IN(29);

			/**
			* Issue the query \|msg\| on the given \|network\|.
			*
			* Returns a file descriptor to watch for read events, or a negative
			* POSIX error code (see errno.h) if an immediate error occurs.
			*/
			int android_res_nsend(net_handle_t network,
			const unsigned char *msg, int msglen) __INTRODUCED_IN(29);

			/**
			* Read a result for the query associated with the \|fd\| descriptor.
			*
			* Returns:
			* < 0: negative POSIX error code (see errno.h for possible values). \|rcode\| is not set.
			* >= 0: length of \|answer\|. \|rcode\| is the resolver return code (e.g., ns_r_nxdomain)
			*/
			int android_res_nresult(int fd,
			int rcode, unsigned char answer, int anslen) __INTRODUCED_IN(29);

			/**
			* Attempts to cancel the in-progress query associated with the \|nsend_fd\|
			* descriptor.
			*/
			void android_res_cancel(int nsend_fd) __INTRODUCED_IN(29);

			#endif /* __ANDROID_API__ >= 29 */

	__END_DECLS		__END_DECLS

	#endif // ANDROID_MULTINETWORK_H		#endif // ANDROID_MULTINETWORK_H

libs/binder/Parcel.cpp

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -878,6 +878,16 @@ status_t Parcel::writeInt64Vector(const std::unique_ptr<std::vector<int64_t>>& v
	return writeNullableTypedVector(val, &Parcel::writeInt64);		return writeNullableTypedVector(val, &Parcel::writeInt64);
	}		}

			status_t Parcel::writeUint64Vector(const std::vector<uint64_t>& val)
			{
			return writeTypedVector(val, &Parcel::writeUint64);
			}

			status_t Parcel::writeUint64Vector(const std::unique_ptr<std::vector<uint64_t>>& val)
			{
			return writeNullableTypedVector(val, &Parcel::writeUint64);
			}

	status_t Parcel::writeFloatVector(const std::vector<float>& val)		status_t Parcel::writeFloatVector(const std::vector<float>& val)
	{		{
	return writeTypedVector(val, &Parcel::writeFloat);		return writeTypedVector(val, &Parcel::writeFloat);
	@@ -1739,6 +1749,14 @@ status_t Parcel::readInt64Vector(std::vector<int64_t>* val) const {
	return readTypedVector(val, &Parcel::readInt64);		return readTypedVector(val, &Parcel::readInt64);
	}		}

			status_t Parcel::readUint64Vector(std::unique_ptr<std::vector<uint64_t>>* val) const {
			return readNullableTypedVector(val, &Parcel::readUint64);
			}

			status_t Parcel::readUint64Vector(std::vector<uint64_t>* val) const {
			return readTypedVector(val, &Parcel::readUint64);
			}

	status_t Parcel::readFloatVector(std::unique_ptr<std::vector<float>>* val) const {		status_t Parcel::readFloatVector(std::unique_ptr<std::vector<float>>* val) const {
	return readNullableTypedVector(val, &Parcel::readFloat);		return readNullableTypedVector(val, &Parcel::readFloat);
	}		}

libs/binder/include/binder/Parcel.h

+4 −0

libs/binder/ndk/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,8 @@ cc_library {
	"include_apex",		"include_apex",
	],		],

			cflags: ["-Wall", "-Wextra", "-Werror"],

	srcs: [		srcs: [
	"ibinder.cpp",		"ibinder.cpp",
	"ibinder_jni.cpp",		"ibinder_jni.cpp",

Original line number	Original line	Diff line number	Diff line
	@@ -139,6 +139,8 @@ public:
	status_t writeInt32Vector(const std::vector<int32_t>& val);		status_t writeInt32Vector(const std::vector<int32_t>& val);
	status_t writeInt64Vector(const std::unique_ptr<std::vector<int64_t>>& val);		status_t writeInt64Vector(const std::unique_ptr<std::vector<int64_t>>& val);
	status_t writeInt64Vector(const std::vector<int64_t>& val);		status_t writeInt64Vector(const std::vector<int64_t>& val);
			status_t writeUint64Vector(const std::unique_ptr<std::vector<uint64_t>>& val);
			status_t writeUint64Vector(const std::vector<uint64_t>& val);
	status_t writeFloatVector(const std::unique_ptr<std::vector<float>>& val);		status_t writeFloatVector(const std::unique_ptr<std::vector<float>>& val);
	status_t writeFloatVector(const std::vector<float>& val);		status_t writeFloatVector(const std::vector<float>& val);
	status_t writeDoubleVector(const std::unique_ptr<std::vector<double>>& val);		status_t writeDoubleVector(const std::unique_ptr<std::vector<double>>& val);
	@@ -313,6 +315,8 @@ public:
	status_t readInt32Vector(std::vector<int32_t>* val) const;		status_t readInt32Vector(std::vector<int32_t>* val) const;
	status_t readInt64Vector(std::unique_ptr<std::vector<int64_t>>* val) const;		status_t readInt64Vector(std::unique_ptr<std::vector<int64_t>>* val) const;
	status_t readInt64Vector(std::vector<int64_t>* val) const;		status_t readInt64Vector(std::vector<int64_t>* val) const;
			status_t readUint64Vector(std::unique_ptr<std::vector<uint64_t>>* val) const;
			status_t readUint64Vector(std::vector<uint64_t>* val) const;
	status_t readFloatVector(std::unique_ptr<std::vector<float>>* val) const;		status_t readFloatVector(std::unique_ptr<std::vector<float>>* val) const;
	status_t readFloatVector(std::vector<float>* val) const;		status_t readFloatVector(std::vector<float>* val) const;
	status_t readDoubleVector(std::unique_ptr<std::vector<double>>* val) const;		status_t readDoubleVector(std::unique_ptr<std::vector<double>>* val) const;