Snap for 10078820 from 87a5f94c7d10a0e991119fb4998ce411cffc1f6c to udc-release (903fba02) · Commits · e / os / platform_frameworks_native

libs/binder/BpBinder.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ std::atomic_bool BpBinder::sCountByUidEnabled(false);
		binder_proxy_limit_callback BpBinder::sLimitCallback;
		bool BpBinder::sBinderProxyThrottleCreate = false;

		static StaticString16 kDescriptorUninit(u"<uninit descriptor>");
		static StaticString16 kDescriptorUninit(u"");

		// Arbitrarily high value that probably distinguishes a bad behaving app
		uint32_t BpBinder::sBinderProxyCountHighWatermark = 2500;

libs/binder/TEST_MAPPING

+0 −6

Original line number	Diff line number	Diff line
		@@ -91,12 +91,6 @@
		{
		"name": "binderRpcTest"
		},
		{
		"name": "CtsRootRollbackManagerHostTestCases"
		},
		{
		"name": "StagedRollbackTest"
		},
		{
		"name": "binderRpcTestNoKernel"
		},

libs/graphicsenv/GraphicsEnv.cpp

+4 −60

Original line number	Diff line number	Diff line
		@@ -433,61 +433,24 @@ bool GraphicsEnv::shouldUseAngle() {
		return (mUseAngle == YES) ? true : false;
		}

		bool GraphicsEnv::angleIsSystemDriver() {
		// Make sure we are init'ed
		if (mAngleAppName.empty()) {
		ALOGV("App name is empty. setAngleInfo() has not been called to enable ANGLE.");
		return false;
		}

		return (mAngleIsSystemDriver == YES) ? true : false;
		}

		bool GraphicsEnv::shouldForceLegacyDriver() {
		// Make sure we are init'ed
		if (mAngleAppName.empty()) {
		ALOGV("App name is empty. setAngleInfo() has not been called to enable ANGLE.");
		return false;
		}

		return (mAngleIsSystemDriver == YES && mUseAngle == NO) ? true : false;
		}

		std::string GraphicsEnv::getLegacySuffix() {
		return mLegacyDriverSuffix;
		}

		void GraphicsEnv::updateUseAngle() {
		mUseAngle = NO;

		const char* ANGLE_PREFER_ANGLE = "angle";
		const char* ANGLE_PREFER_LEGACY = "legacy";
		// The following is a deprecated version of "legacy"
		const char* ANGLE_PREFER_NATIVE = "native";

		mUseAngle = NO;
		if (mAngleDeveloperOptIn == ANGLE_PREFER_ANGLE) {
		ALOGI("Using ANGLE, the %s GLES driver for package '%s'",
		mAngleIsSystemDriver == YES ? "system" : "optional", mAngleAppName.c_str());
		ALOGV("User set \"Developer Options\" to force the use of ANGLE");
		mUseAngle = YES;
		} else if (mAngleDeveloperOptIn == ANGLE_PREFER_LEGACY \|\|
		mAngleDeveloperOptIn == ANGLE_PREFER_NATIVE) {
		ALOGI("Using the (%s) Legacy GLES driver for package '%s'",
		mAngleIsSystemDriver == YES ? "optional" : "system", mAngleAppName.c_str());
		} else if (mAngleDeveloperOptIn == ANGLE_PREFER_NATIVE) {
		ALOGV("User set \"Developer Options\" to force the use of Native");
		} else {
		ALOGV("User set invalid \"Developer Options\": '%s'", mAngleDeveloperOptIn.c_str());
		}
		}

		void GraphicsEnv::setAngleInfo(const std::string path, const std::string appName,
		const bool angleIsSystemDriver, const std::string developerOptIn,
		const std::string developerOptIn,
		const std::vector<std::string> eglFeatures) {
		// Set whether ANGLE is the system driver:
		mAngleIsSystemDriver = angleIsSystemDriver ? YES : NO;

		// Note: Given the current logic and lack of the old rules file processing,
		// there seems to be little chance that mUseAngle != UNKNOWN. Leave this
		// for now, even though it seems outdated.
		if (mUseAngle != UNKNOWN) {
		// We've already figured out an answer for this app, so just return.
		ALOGV("Already evaluated the rules file for '%s': use ANGLE = %s", appName.c_str(),
		@@ -508,25 +471,6 @@ void GraphicsEnv::setAngleInfo(const std::string path, const std::string appName
		updateUseAngle();
		}

		void GraphicsEnv::setLegacyDriverInfo(const std::string appName, const bool angleIsSystemDriver,
		const std::string legacyDriverName) {
		ALOGV("setting legacy app name to '%s'", appName.c_str());
		mAngleAppName = appName;

		// Force the use of the legacy driver instead of ANGLE
		const char* ANGLE_PREFER_LEGACY = "legacy";
		mAngleDeveloperOptIn = ANGLE_PREFER_LEGACY;
		ALOGV("setting ANGLE application opt-in to 'legacy'");

		// Set whether ANGLE is the system driver:
		mAngleIsSystemDriver = angleIsSystemDriver ? YES : NO;

		mLegacyDriverSuffix = legacyDriverName;

		// Update the current status of whether we should use ANGLE or not
		updateUseAngle();
		}

		void GraphicsEnv::setLayerPaths(NativeLoaderNamespace* appNamespace, const std::string layerPaths) {
		if (mLayerPaths.empty()) {
		mLayerPaths = layerPaths;

libs/graphicsenv/include/graphicsenv/GraphicsEnv.h

+1 −16

Original line number	Diff line number	Diff line
		@@ -100,28 +100,17 @@ public:
		bool shouldUseAngle(std::string appName);
		// Check if this app process should use ANGLE.
		bool shouldUseAngle();
		// If ANGLE is the system GLES driver
		bool angleIsSystemDriver();
		// If should use legacy driver instead of a system ANGLE driver
		bool shouldForceLegacyDriver();
		// Set a search path for loading ANGLE libraries. The path is a list of
		// directories separated by ':'. A directory can be contained in a zip file
		// (libraries must be stored uncompressed and page aligned); such elements
		// in the search path must have a '!' after the zip filename, e.g.
		// /system/app/ANGLEPrebuilt/ANGLEPrebuilt.apk!/lib/arm64-v8a
		void setAngleInfo(const std::string path, const std::string appName,
		const bool angleIsSystemDriver, std::string devOptIn,
		void setAngleInfo(const std::string path, const std::string appName, std::string devOptIn,
		const std::vector<std::string> eglFeatures);
		// Set the state so that the legacy driver will be used, and in case ANGLE
		// is the system driver, provide the name of the legacy driver.
		void setLegacyDriverInfo(const std::string appName, const bool angleIsSystemDriver,
		const std::string legacyDriverName);
		// Get the ANGLE driver namespace.
		android_namespace_t* getAngleNamespace();
		// Get the app name for ANGLE debug message.
		std::string& getAngleAppName();
		// Get the legacy driver's suffix name.
		std::string getLegacySuffix();

		const std::vector<std::string>& getAngleEglFeatures();

		@@ -178,10 +167,6 @@ private:
		std::string mAngleDeveloperOptIn;
		// ANGLE EGL features;
		std::vector<std::string> mAngleEglFeatures;
		// ANGLE is System Driver flag.
		UseAngle mAngleIsSystemDriver = UNKNOWN;
		// Legacy driver name to use when ANGLE is the system driver.
		std::string mLegacyDriverSuffix;
		// Use ANGLE flag.
		UseAngle mUseAngle = UNKNOWN;
		// Vulkan debug layers libs.

libs/gui/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ filegroup {
		"android/gui/IWindowInfosListener.aidl",
		"android/gui/IWindowInfosReportedListener.aidl",
		"android/gui/WindowInfo.aidl",
		"android/gui/WindowInfosUpdate.aidl",
		],
		}

		@@ -90,9 +91,11 @@ cc_library_static {
		"android/gui/InputApplicationInfo.aidl",
		"android/gui/IWindowInfosListener.aidl",
		"android/gui/IWindowInfosReportedListener.aidl",
		"android/gui/WindowInfosUpdate.aidl",
		"android/gui/WindowInfo.aidl",
		"DisplayInfo.cpp",
		"WindowInfo.cpp",
		"WindowInfosUpdate.cpp",
		],

		shared_libs: [