Commit fa6c8ebc authored Jul 08, 2016 by Eino-Ville Talvala Committed by android-build-merger Jul 08, 2016

Merge \\"Camera service: Trust telephony service to forward client UIDs.\\"...

Merge \\"Camera service: Trust telephony service to forward client UIDs.\\" into nyc-mr1-dev am: 24edc3b9
am: 55943ae6

Change-Id: I73d487c6b29cf07759cb775548b1dd5a3567af46

parents 635127bc 55943ae6

services/camera/libcameraservice/CameraService.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -915,6 +915,7 @@ static bool isTrustedCallingUid(uid_t uid) {
		switch (uid) {
		case AID_MEDIA: // mediaserver
		case AID_CAMERASERVER: // cameraserver
		case AID_RADIO: // telephony
		return true;
		default:
		return false;