Merge "Switch media fw hotword permission check to PermissionChecker (native)" into sc-dev (a2d40611) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/permission/android/permission/PermissionChecker.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,14 @@ PermissionChecker::PermissionResult
		/startDataDelivery/ true, /fromDatasource/ true, attributedOpCode);
		}

		PermissionChecker::PermissionResult PermissionChecker::checkPermissionForPreflight(
		const String16& permission, const AttributionSourceState& attributionSource,
		const String16& message, int32_t attributedOpCode)
		{
		return checkPermission(permission, attributionSource, message, /forDataDelivery/ false,
		/startDataDelivery/ false, /fromDatasource/ false, attributedOpCode);
		}

		PermissionChecker::PermissionResult PermissionChecker::checkPermissionForPreflightFromDatasource(
		const String16& permission, const AttributionSourceState& attributionSource,
		const String16& message, int32_t attributedOpCode)

libs/permission/include/android/permission/PermissionChecker.h

+23 −0

Original line number	Diff line number	Diff line
		@@ -96,6 +96,29 @@ public:
		const String16& permission, const AttributionSourceState& attributionSource,
		const String16& message, int32_t attributedOpCode);

		/**
		* Checks whether a given data access chain described by the given attribution source
		* has a given permission and whether the app op that corresponds to this permission
		* is allowed. The app ops are not noted/started.
		*
		* NOTE: Use this method only for permission checks at the preflight point where you
		* will not deliver the permission protected data to clients but schedule permission
		* data delivery, apps register listeners, etc.
		*
		* @param permission The permission to check.
		* @param attributionSource The attribution chain to check.
		* @param message A message describing the reason the permission was checked.
		* @param attributedOpCode The op code towards which to blame the access. If this
		* is a valid app op the op corresponding to the checked permission (if such)
		* would only be checked to ensure it is allowed and if that succeeds the
		* starting would be against the attributed op.
		* @return The permission check result which is either PERMISSION_GRANTED,
		* or PERMISSION_SOFT_DENIED or PERMISSION_HARD_DENIED.
		*/
		PermissionResult checkPermissionForPreflight(
		const String16& permission, const AttributionSourceState& attributionSource,
		const String16& message, int32_t attributedOpCode);

		/**
		* Checks whether a given data access chain described by the given attribution source
		* has a given permission and whether the app op that corresponds to this permission