Snap for 7272808 from cc6080011d6e7c7ab219d6c4f7eabc99574dca87 to sc-release (442ad682) · Commits · e / os / android_frameworks_native

cmds/surfacereplayer/proto/src/trace.proto

+0 −5

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ message SurfaceChange {
		CornerRadiusChange corner_radius = 16;
		ReparentChange reparent = 17;
		RelativeParentChange relative_parent = 18;
		ReparentChildrenChange reparent_children = 19;
		BackgroundBlurRadiusChange background_blur_radius = 20;
		ShadowRadiusChange shadow_radius = 21;
		BlurRegionsChange blur_regions = 22;
		@@ -190,10 +189,6 @@ message ReparentChange {
		required int32 parent_id = 1;
		}

		message ReparentChildrenChange {
		required int32 parent_id = 1;
		}

		message RelativeParentChange {
		required int32 relative_parent_id = 1;
		required int32 z = 2;

+0 −12

Original line number	Diff line number	Diff line
		@@ -410,9 +410,6 @@ status_t Replayer::doSurfaceTransaction(
		case SurfaceChange::SurfaceChangeCase::kReparent:
		setReparentChange(transaction, change.id(), change.reparent());
		break;
		case SurfaceChange::SurfaceChangeCase::kReparentChildren:
		setReparentChildrenChange(transaction, change.id(), change.reparent_children());
		break;
		case SurfaceChange::SurfaceChangeCase::kRelativeParent:
		setRelativeParentChange(transaction, change.id(), change.relative_parent());
		break;
		@@ -709,15 +706,6 @@ void Replayer::setRelativeParentChange(SurfaceComposerClient::Transaction& t,
		t.setRelativeLayer(mLayers[id], mLayers[c.relative_parent_id()], c.z());
		}

		void Replayer::setReparentChildrenChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const ReparentChildrenChange& c) {
		if (mLayers.count(c.parent_id()) == 0 \|\| mLayers[c.parent_id()] == nullptr) {
		ALOGE("Layer %d not found in reparent children transaction", c.parent_id());
		return;
		}
		t.reparentChildren(mLayers[id], mLayers[c.parent_id()]);
		}

		void Replayer::setShadowRadiusChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const ShadowRadiusChange& c) {
		t.setShadowRadius(mLayers[id], c.radius());

+0 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,6 @@ class Replayer {
		layer_id id, const ReparentChange& c);
		void setRelativeParentChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const RelativeParentChange& c);
		void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const ReparentChildrenChange& c);
		void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const ShadowRadiusChange& c);
		void setBlurRegionsChange(SurfaceComposerClient::Transaction& t,

+11 −6

Original line number	Diff line number	Diff line
		@@ -60,16 +60,13 @@ cc_library_headers {
		// Currently, these are only on system android (not vendor, not host)
		// TODO(b/183654927) - move these into separate libraries
		libbinder_device_interface_sources = [
		"ActivityManager.cpp",
		"AppOpsManager.cpp",
		"IActivityManager.cpp",
		"IAppOpsCallback.cpp",
		"IAppOpsService.cpp",

		"IPermissionController.cpp",
		"IUidObserver.cpp",
		"PermissionCache.cpp",
		"PermissionController.cpp",
		":activity_manager_procstate_aidl",
		]

		cc_library {
		@@ -294,13 +291,21 @@ cc_library {
		],
		}

		// TODO(b/183654927): initially empty lib to work around some merge conflicts
		cc_library {
		name: "libactivitymanager_aidl",
		srcs: [],
		srcs: [
		"ActivityManager.cpp",
		"IActivityManager.cpp",
		"IUidObserver.cpp",
		":activity_manager_procstate_aidl",
		],
		export_include_dirs: ["include_activitymanager"],
		shared_libs: [
		"libbinder",
		"libutils",
		"liblog",
		],
		aidl: {
		export_aidl_headers: true,
		},
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@

		#include <binder/IAppOpsService.h>

		#include <utils/Log.h>
		#include <binder/Parcel.h>
		#include <utils/Log.h>
		#include <utils/String8.h>

		#include <optional>
		@@ -63,6 +63,8 @@ public:
		remote()->transact(NOTE_OPERATION_TRANSACTION, data, &reply);
		// fail on exception
		if (reply.readExceptionCode() != 0) return MODE_ERRORED;
		// TODO b/184855056: extract to class
		reply.readInt32();
		reply.readByte();
		return reply.readInt32();
		}
		@@ -85,6 +87,8 @@ public:
		remote()->transact(START_OPERATION_TRANSACTION, data, &reply);
		// fail on exception
		if (reply.readExceptionCode() != 0) return MODE_ERRORED;
		// TODO b/184855056: extract to class
		reply.readInt32();
		reply.readByte();
		return reply.readInt32();
		}