Snap for 6134912 from dc82d9e659fbcbfd7e58e2f830105e13391c2917 to rvc-release (3649b7b8) · Commits · e / os / android_frameworks_native-old

cmds/atrace/atrace.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -854,7 +854,6 @@ static bool setUpUserspaceTracing()
		tags \|= c.tags;
		}
		}
		ok &= setTagsProperty(tags);

		bool coreServicesTagEnabled = false;
		for (size_t i = 0; i < arraysize(k_categories); i++) {
		@@ -876,9 +875,11 @@ static bool setUpUserspaceTracing()
		packageList += android::base::GetProperty(k_coreServicesProp, "");
		}
		ok &= setAppCmdlineProperty(&packageList[0]);
		ok &= setTagsProperty(tags);
		#if !ATRACE_SHMEM
		ok &= pokeBinderServices();
		pokeHalServices();

		#endif
		if (g_tracePdx) {
		ok &= ServiceUtility::PokeServices();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -606,7 +606,7 @@ void Replayer::setDisplayProjection(SurfaceComposerClient::Transaction& t,
		pc.viewport().bottom());
		Rect frame = Rect(pc.frame().left(), pc.frame().top(), pc.frame().right(), pc.frame().bottom());

		t.setDisplayProjection(mDisplays[id], pc.orientation(), viewport, frame);
		t.setDisplayProjection(mDisplays[id], ui::toRotation(pc.orientation()), viewport, frame);
		}

		status_t Replayer::createSurfaceControl(

+13 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,19 @@ typedef struct {
		int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
		AndroidBitmapInfo* info);

		#if __ANDROID_API__ >= 30

		/**
		* Given a java bitmap object, return its ADataSpace.
		*
		* Note that ADataSpace only exposes a few values. This may return
		* ADATASPACE_UNKNOWN, even for Named ColorSpaces, if they have no
		* corresponding ADataSpace.
		*/
		int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) __INTRODUCED_IN(30);

		#endif // __ANDROID_API__ >= 30

		/**
		* Given a java bitmap object, attempt to lock the pixel address.
		* Locking will ensure that the memory for the pixels will not move

+10 −3

Original line number	Diff line number	Diff line
		@@ -17,16 +17,23 @@
		#ifndef _LIBINPUT_DISPLAY_VIEWPORT_H
		#define _LIBINPUT_DISPLAY_VIEWPORT_H

		#include <cinttypes>
		#include <optional>

		#include <android-base/stringprintf.h>
		#include <ui/DisplayInfo.h>
		#include <input/Input.h>
		#include <inttypes.h>
		#include <optional>

		using android::base::StringPrintf;

		namespace android {

		enum {
		DISPLAY_ORIENTATION_0 = 0,
		DISPLAY_ORIENTATION_90 = 1,
		DISPLAY_ORIENTATION_180 = 2,
		DISPLAY_ORIENTATION_270 = 3
		};

		/**
		* Describes the different type of viewports supported by input flinger.
		* Keep in sync with values in InputManagerService.java.

+0 −1