Snap for 5171533 from 1e0c1cc1222cc71ef635d79e8c747bb20d7b358a to qt-release (4b923eb9) · Commits · e / os / platform_frameworks_native

data/etc/android.software.ipsec_tunnels.xml

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2018 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<!--
		This is the feature indicating that the device has support for multinetworking-capable IPsec
		tunnels
		-->

		<permissions>
		<feature name="android.software.ipsec_tunnels" />
		</permissions>

headers/media_plugin/media/cas/DescramblerAPI.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -72,12 +72,12 @@ struct DescramblerPlugin {
		// associated MediaCas session is used to load decryption keys
		// into the crypto/cas plugin. The keys are then referenced by key-id
		// in the 'key' parameter to the decrypt() method.
		// Should return NO_ERROR on success, ERROR_DRM_SESSION_NOT_OPENED if
		// Should return NO_ERROR on success, ERROR_CAS_SESSION_NOT_OPENED if
		// the session is not opened and a code from MediaErrors.h otherwise.
		virtual status_t setMediaCasSession(const CasSessionId& sessionId) = 0;

		// If the error returned falls into the range
		// ERROR_DRM_VENDOR_MIN..ERROR_DRM_VENDOR_MAX, errorDetailMsg should be
		// ERROR_CAS_VENDOR_MIN..ERROR_CAS_VENDOR_MAX, errorDetailMsg should be
		// filled in with an appropriate string.
		// At the java level these special errors will then trigger a
		// MediaCodec.CryptoException that gives clients access to both

include/android/trace.h

+35 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#define ANDROID_NATIVE_TRACE_H

		#include <stdbool.h>
		#include <stdint.h>
		#include <sys/cdefs.h>

		#ifdef __cplusplus
		@@ -73,6 +74,40 @@ void ATrace_endSection() __INTRODUCED_IN(23);

		#endif /* __ANDROID_API__ >= 23 */

		#if __ANDROID_API__ >= __ANDROID_API_Q__

		/**
		* Writes a trace message to indicate that a given section of code has
		* begun. Must be followed by a call to {@link ATrace_endAsyncSection} with the same
		* methodName and cookie. Unlike {@link ATrace_beginSection} and {@link ATrace_endSection},
		* asynchronous events do not need to be nested. The name and cookie used to
		* begin an event must be used to end it.
		*
		* \param sectionName The method name to appear in the trace.
		* \param cookie Unique identifier for distinguishing simultaneous events
		*/
		void ATrace_beginAsyncSection(const char* sectionName, int32_t cookie) __INTRODUCED_IN(29);

		/**
		* Writes a trace message to indicate that the current method has ended.
		* Must be called exactly once for each call to {@link ATrace_beginAsyncSection}
		* using the same name and cookie.
		*
		* \param methodName The method name to appear in the trace.
		* \param cookie Unique identifier for distinguishing simultaneous events
		*/
		void ATrace_endAsyncSection(const char* sectionName, int32_t cookie) __INTRODUCED_IN(29);

		/**
		* Writes trace message to indicate the value of a given counter.
		*
		* \param counterName The counter name to appear in the trace.
		* \param counterValue The counter value.
		*/
		void ATrace_setCounter(const char* counterName, int64_t counterValue) __INTRODUCED_IN(29);

		#endif /* __ANDROID_API__ >= 29 */

		#ifdef __cplusplus
		};
		#endif

libs/binder/Parcel.cpp

+9 −3

Original line number	Diff line number	Diff line
		@@ -467,7 +467,6 @@ status_t Parcel::setData(const uint8_t* buffer, size_t len)

		status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
		{
		const sp<ProcessState> proc(ProcessState::self());
		status_t err;
		const uint8_t *data = parcel->mData;
		const binder_size_t *objects = parcel->mObjects;
		@@ -520,6 +519,7 @@ status_t Parcel::appendFrom(const Parcel *parcel, size_t offset, size_t len)
		err = NO_ERROR;

		if (numObjects > 0) {
		const sp<ProcessState> proc(ProcessState::self());
		// grow objects
		if (mObjectsCapacity < mObjectsSize + numObjects) {
		size_t newSize = ((mObjectsSize + numObjects)*3)/2;
		@@ -2559,8 +2559,11 @@ void Parcel::print(TextOutput& to, uint32_t /flags/) const

		void Parcel::releaseObjects()
		{
		const sp<ProcessState> proc(ProcessState::self());
		size_t i = mObjectsSize;
		if (i == 0) {
		return;
		}
		sp<ProcessState> proc(ProcessState::self());
		uint8_t* const data = mData;
		binder_size_t* const objects = mObjects;
		while (i > 0) {
		@@ -2573,8 +2576,11 @@ void Parcel::releaseObjects()

		void Parcel::acquireObjects()
		{
		const sp<ProcessState> proc(ProcessState::self());
		size_t i = mObjectsSize;
		if (i == 0) {
		return;
		}
		const sp<ProcessState> proc(ProcessState::self());
		uint8_t* const data = mData;
		binder_size_t* const objects = mObjects;
		while (i > 0) {

libs/graphicsenv/GraphicsEnv.cpp

+11 −5

Original line number	Diff line number	Diff line
		@@ -135,8 +135,8 @@ void GraphicsEnv::setDriverPath(const std::string path) {
		}

		void GraphicsEnv::setAngleInfo(const std::string path, const std::string appName,
		bool developerOptIn, const int rulesFd, const long rulesOffset,
		const long rulesLength) {
		const std::string developerOptIn, const int rulesFd,
		const long rulesOffset, const long rulesLength) {
		if (!mAnglePath.empty()) {
		ALOGV("ignoring attempt to change ANGLE path from '%s' to '%s'", mAnglePath.c_str(),
		path.c_str());
		@@ -153,7 +153,13 @@ void GraphicsEnv::setAngleInfo(const std::string path, const std::string appName
		mAngleAppName = appName;
		}

		if (!mAngleDeveloperOptIn.empty()) {
		ALOGV("ignoring attempt to change ANGLE application opt-in from '%s' to '%s'",
		mAngleDeveloperOptIn.c_str(), developerOptIn.c_str());
		} else {
		ALOGV("setting ANGLE application opt-in to '%s'", developerOptIn.c_str());
		mAngleDeveloperOptIn = developerOptIn;
		}

		ALOGV("setting ANGLE rules file descriptor to '%i'", rulesFd);
		mAngleRulesFd = rulesFd;
		@@ -182,8 +188,8 @@ const char* GraphicsEnv::getAngleAppName() {
		return mAngleAppName.c_str();
		}

		bool GraphicsEnv::getAngleDeveloperOptIn() {
		return mAngleDeveloperOptIn;
		const char* GraphicsEnv::getAngleDeveloperOptIn() {
		return mAngleDeveloperOptIn.c_str();
		}

		int GraphicsEnv::getAngleRulesFd() {