Snap for 7419753 from f3e492125bf0df905e98a138d972c917d8f028db to sc-d1-release (343d5654) · Commits · e / os / android_frameworks_native-old

aidl/gui/android/view/LayerMetadataKey.aidl

+1 −0

+2 −0

Original line number	Diff line number	Diff line
		@@ -136,6 +136,8 @@ std::string LayerMetadata::itemToString(uint32_t key, const char* separator) con
		return StringPrintf("ownerPID%s%d", separator, getInt32(key, 0));
		case view::LayerMetadataKey::METADATA_DEQUEUE_TIME:
		return StringPrintf("dequeueTime%s%" PRId64, separator, *getInt64(key));
		case view::LayerMetadataKey::METADATA_GAME_MODE:
		return StringPrintf("gameMode%s%d", separator, getInt32(key, 0));
		default:
		return StringPrintf("%d%s%dbytes", key, separator,
		static_cast<int>(mMap.at(key).size()));

+2 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,8 @@ enum {
		METADATA_MOUSE_CURSOR = 4,
		METADATA_ACCESSIBILITY_ID = 5,
		METADATA_OWNER_PID = 6,
		METADATA_DEQUEUE_TIME = 7
		METADATA_DEQUEUE_TIME = 7,
		METADATA_GAME_MODE = 8
		};

		struct LayerMetadata : public Parcelable {

+14 −7

Original line number	Diff line number	Diff line
		@@ -11,19 +11,24 @@ aidl_interface {
		name: "framework-permission-aidl",
		unstable: true,
		local_include_dir: "aidl",
		backend: {
		ndk: {
		enabled: false
		}
		},
		host_supported: true,
		vendor_available: true,
		double_loadable: true,
		srcs: [
		"aidl/android/content/AttributionSourceState.aidl",
		"aidl/android/permission/IPermissionChecker.aidl",
		],
		}

		cc_library_shared {
		cc_library {
		name: "libpermission",
		host_supported: true,
		double_loadable: true,
		target: {
		darwin: {
		enabled: false,
		},
		},
		cflags: [
		"-Wall",
		"-Wextra",
		@@ -45,5 +50,7 @@ cc_library_shared {
		static_libs: [
		"framework-permission-aidl-cpp",
		],
		export_static_lib_headers: ["framework-permission-aidl-cpp"],
		export_static_lib_headers: [
		"framework-permission-aidl-cpp"
		],
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,10 @@ package android.content;
		* {@hide}
		*/
		parcelable AttributionSourceState {
		/** The PID that is accessing the permission protected data. */
		int pid = -1;
		/** The UID that is accessing the permission protected data. */
		int uid;
		int uid = -1;
		/** The package that is accessing the permission protected data. */
		@nullable @utf8InCpp String packageName;
		/** The attribution tag of the app accessing the permission protected data. */
		@@ -36,5 +38,5 @@ parcelable AttributionSourceState {
		/** The next app to receive the permission protected data. */
		// TODO: We use an array as a workaround - the C++ backend doesn't
		// support referring to the parcelable as it expects ctor/dtor
		@nullable AttributionSourceState[] next;
		AttributionSourceState[] next;
		}