Snap for 4801384 from db83ea84ab10d097e692edfe32972eeea7312fd9 to pi-release (9ba99577) · Commits · e / os / android_frameworks_native-old

cmds/atrace/atrace.cpp

+14 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ using std::string;
		#define MAX_SYS_FILES 10

		const char* k_traceTagsProperty = "debug.atrace.tags.enableflags";
		const char* k_userInitiatedTraceProperty = "debug.atrace.user_initiated";

		const char* k_traceAppsNumberProperty = "debug.atrace.app_number";
		const char* k_traceAppsPropertyTemplate = "debug.atrace.app_%d";
		@@ -447,6 +448,16 @@ static bool setTraceOverwriteEnable(bool enable)
		return setKernelOptionEnable(k_tracingOverwriteEnablePath, enable);
		}

		// Set the user initiated trace property
		static bool setUserInitiatedTraceProperty(bool enable)
		{
		if (!android::base::SetProperty(k_userInitiatedTraceProperty, enable ? "1" : "")) {
		fprintf(stderr, "error setting user initiated strace system property\n");
		return false;
		}
		return true;
		}

		// Enable or disable kernel tracing.
		static bool setTracingEnabled(bool enable)
		{
		@@ -840,6 +851,8 @@ static bool setUpKernelTracing()
		{
		bool ok = true;

		ok &= setUserInitiatedTraceProperty(true);

		// Set up the tracing options.
		ok &= setCategoriesEnableFromFile(g_categoriesFile);
		ok &= setTraceOverwriteEnable(g_traceOverwrite);
		@@ -887,6 +900,7 @@ static void cleanUpKernelTracing()
		setTraceBufferSizeKB(1);
		setPrintTgidEnableIfPresent(false);
		setKernelTraceFuncs(NULL);
		setUserInitiatedTraceProperty(false);
		}

		// Enable tracing in the kernel.

data/etc/aosp_excluded_hardware.xml

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright 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.
		-->

		<permissions>
		<!-- This should be used to exclude this feature from aosp targets. As aosp configurations
		may or may not have a valid location provider -->
		<unavailable-feature name="android.hardware.location.network" />
		</permissions>

libs/binder/BpBinder.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ BpBinder::BpBinder(int32_t handle, int32_t trackedUid)
		ALOGV("Creating BpBinder %p handle %d\n", this, mHandle);

		extendObjectLifetime(OBJECT_LIFETIME_WEAK);
		IPCThreadState::self()->incWeakHandle(handle);
		IPCThreadState::self()->incWeakHandle(handle, this);
		}

		bool BpBinder::isDescriptorCached() const {
		@@ -412,7 +412,7 @@ void BpBinder::onFirstRef()
		{
		ALOGV("onFirstRef BpBinder %p handle %d\n", this, mHandle);
		IPCThreadState* ipc = IPCThreadState::self();
		if (ipc) ipc->incStrongHandle(mHandle);
		if (ipc) ipc->incStrongHandle(mHandle, this);
		}

		void BpBinder::onLastStrongRef(const void* /id/)

libs/binder/IPCThreadState.cpp

+35 −3

Original line number	Diff line number	Diff line
		@@ -409,6 +409,15 @@ void IPCThreadState::flushCommands()
		if (mProcess->mDriverFD <= 0)
		return;
		talkWithDriver(false);
		// The flush could have caused post-write refcount decrements to have
		// been executed, which in turn could result in BC_RELEASE/BC_DECREFS
		// being queued in mOut. So flush again, if we need to.
		if (mOut.dataSize() > 0) {
		talkWithDriver(false);
		}
		if (mOut.dataSize() > 0) {
		ALOGW("mOut.dataSize() > 0 after flushCommands()");
		}
		}

		void IPCThreadState::blockUntilThreadAvailable()
		@@ -501,6 +510,21 @@ void IPCThreadState::processPendingDerefs()
		}
		}

		void IPCThreadState::processPostWriteDerefs()
		{
		for (size_t i = 0; i < mPostWriteWeakDerefs.size(); i++) {
		RefBase::weakref_type* refs = mPostWriteWeakDerefs[i];
		refs->decWeak(mProcess.get());
		}
		mPostWriteWeakDerefs.clear();

		for (size_t i = 0; i < mPostWriteStrongDerefs.size(); i++) {
		RefBase* obj = mPostWriteStrongDerefs[i];
		obj->decStrong(mProcess.get());
		}
		mPostWriteStrongDerefs.clear();
		}

		void IPCThreadState::joinThreadPool(bool isMain)
		{
		LOG_THREADPOOL("**** THREAD %p (PID %d) IS JOINING THE THREAD POOL\n", (void*)pthread_self(), getpid());
		@@ -627,11 +651,14 @@ status_t IPCThreadState::transact(int32_t handle,
		return err;
		}

		void IPCThreadState::incStrongHandle(int32_t handle)
		void IPCThreadState::incStrongHandle(int32_t handle, BpBinder *proxy)
		{
		LOG_REMOTEREFS("IPCThreadState::incStrongHandle(%d)\n", handle);
		mOut.writeInt32(BC_ACQUIRE);
		mOut.writeInt32(handle);
		// Create a temp reference until the driver has handled this command.
		proxy->incStrong(mProcess.get());
		mPostWriteStrongDerefs.push(proxy);
		}

		void IPCThreadState::decStrongHandle(int32_t handle)
		@@ -641,11 +668,14 @@ void IPCThreadState::decStrongHandle(int32_t handle)
		mOut.writeInt32(handle);
		}

		void IPCThreadState::incWeakHandle(int32_t handle)
		void IPCThreadState::incWeakHandle(int32_t handle, BpBinder *proxy)
		{
		LOG_REMOTEREFS("IPCThreadState::incWeakHandle(%d)\n", handle);
		mOut.writeInt32(BC_INCREFS);
		mOut.writeInt32(handle);
		// Create a temp reference until the driver has handled this command.
		proxy->getWeakRefs()->incWeak(mProcess.get());
		mPostWriteWeakDerefs.push(proxy->getWeakRefs());
		}

		void IPCThreadState::decWeakHandle(int32_t handle)
		@@ -897,8 +927,10 @@ status_t IPCThreadState::talkWithDriver(bool doReceive)
		if (bwr.write_consumed > 0) {
		if (bwr.write_consumed < mOut.dataSize())
		mOut.remove(0, bwr.write_consumed);
		else
		else {
		mOut.setDataSize(0);
		processPostWriteDerefs();
		}
		}
		if (bwr.read_consumed > 0) {
		mIn.setDataSize(bwr.read_consumed);

libs/binder/include/binder/IPCThreadState.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -64,9 +64,9 @@ public:
		uint32_t code, const Parcel& data,
		Parcel* reply, uint32_t flags);

		void incStrongHandle(int32_t handle);
		void incStrongHandle(int32_t handle, BpBinder *proxy);
		void decStrongHandle(int32_t handle);
		void incWeakHandle(int32_t handle);
		void incWeakHandle(int32_t handle, BpBinder *proxy);
		void decWeakHandle(int32_t handle);
		status_t attemptIncStrongHandle(int32_t handle);
		static void expungeHandle(int32_t handle, IBinder* binder);
		@@ -106,6 +106,7 @@ private:
		status_t getAndExecuteCommand();
		status_t executeCommand(int32_t command);
		void processPendingDerefs();
		void processPostWriteDerefs();

		void clearCaller();

		@@ -118,7 +119,8 @@ private:
		const sp<ProcessState> mProcess;
		Vector<BBinder*> mPendingStrongDerefs;
		Vector<RefBase::weakref_type*> mPendingWeakDerefs;

		Vector<RefBase*> mPostWriteStrongDerefs;
		Vector<RefBase::weakref_type*> mPostWriteWeakDerefs;
		Parcel mIn;
		Parcel mOut;
		status_t mLastError;