Revert "appop: reimplement OP_RECORD_AUDIO op check in mediaserver" (69741812) · Commits · e / os / android_frameworks_av

services/audioflinger/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,6 @@ include $(BUILD_STATIC_LIBRARY)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		PackageManager.cpp \
		AudioFlinger.cpp \
		Threads.cpp \
		Tracks.cpp \

services/audioflinger/AudioFlinger.cpp

+6 −39

Original line number	Diff line number	Diff line
		@@ -65,7 +65,6 @@
		#include "AudioMixer.h"
		#include "AudioFlinger.h"
		#include "ServiceUtilities.h"
		#include "PackageManager.h"

		#include <media/EffectsFactoryApi.h>
		#include <audio_effects/effect_visualizer.h>
		@@ -1342,14 +1341,11 @@ void AudioFlinger::registerClient(const sp<IAudioFlingerClient>& client)

		Mutex::Autolock _l(mLock);

		IPCThreadState* ipcState = IPCThreadState::self();
		pid_t pid = ipcState->getCallingPid();
		uid_t uid = ipcState->getCallingUid();
		pid_t pid = IPCThreadState::self()->getCallingPid();
		if (mNotificationClients.indexOfKey(pid) < 0) {
		sp<NotificationClient> notificationClient = new NotificationClient(this,
		client,
		pid,
		getNameForUid(uid));
		pid);
		ALOGV("registerClient() client %p, pid %d", notificationClient.get(), pid);

		mNotificationClients.add(pid, notificationClient);
		@@ -1523,8 +1519,8 @@ void AudioFlinger::Client::releaseTimedTrack()

		AudioFlinger::NotificationClient::NotificationClient(const sp<AudioFlinger>& audioFlinger,
		const sp<IAudioFlingerClient>& client,
		pid_t pid, const String16 clientName)
		: mAudioFlinger(audioFlinger), mPid(pid), mAudioFlingerClient(client), mClientName(clientName)
		pid_t pid)
		: mAudioFlinger(audioFlinger), mPid(pid), mAudioFlingerClient(client)
		{
		}

		@@ -1569,7 +1565,7 @@ sp<IAudioRecord> AudioFlinger::openRecord(
		#endif

		// check calling permissions
		if (!recordingAllowed() \|\| !checkAudioRecordOp()) {
		if (!recordingAllowed()) {
		ALOGE("openRecord() permission denied: recording not allowed");
		lStatus = PERMISSION_DENIED;
		goto Exit;
		@@ -2645,7 +2641,7 @@ sp<IEffect> AudioFlinger::createEffect(

		// check recording permission for visualizer
		if ((memcmp(&desc.type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0) &&
		(!recordingAllowed() \|\| !checkAudioRecordOp())) {
		!recordingAllowed()) {
		lStatus = PERMISSION_DENIED;
		goto Exit;
		}
		@@ -2998,33 +2994,4 @@ status_t AudioFlinger::onTransact(
		return BnAudioFlinger::onTransact(code, data, reply, flags);
		}

		bool AudioFlinger::checkAudioRecordOp()
		{
		IPCThreadState* ipcState = IPCThreadState::self();
		pid_t pid = ipcState->getCallingPid();
		uid_t uid = ipcState->getCallingUid();

		if (uid < AID_APP) {
		return true;
		}

		Mutex::Autolock _l(mLock);

		{
		String16 clientName;
		int index = mNotificationClients.indexOfKey(pid);
		if (index >= 0) {
		clientName = mNotificationClients.valueAt(index)->clientName();
		}

		if (clientName.size() <= 0) {
		return true;
		}

		// check AppOp permission
		return (mAppOpsManager.noteOp(AppOpsManager::OP_RECORD_AUDIO, uid, clientName) ==
		AppOpsManager::MODE_ALLOWED);
		}
		}

		}; // namespace android

services/audioflinger/AudioFlinger.h

+1 −8

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@
		#include <utils/TypeHelpers.h>
		#include <utils/Vector.h>

		#include <binder/AppOpsManager.h>
		#include <binder/BinderService.h>
		#include <binder/MemoryDealer.h>

		@@ -389,11 +388,10 @@ private:
		public:
		NotificationClient(const sp<AudioFlinger>& audioFlinger,
		const sp<IAudioFlingerClient>& client,
		pid_t pid, const String16 clientName);
		pid_t pid);
		virtual ~NotificationClient();

		sp<IAudioFlingerClient> audioFlingerClient() const { return mAudioFlingerClient; }
		String16 clientName() const { return mClientName; }

		// IBinder::DeathRecipient
		virtual void binderDied(const wp<IBinder>& who);
		@@ -405,7 +403,6 @@ private:
		const sp<AudioFlinger> mAudioFlinger;
		const pid_t mPid;
		const sp<IAudioFlingerClient> mAudioFlingerClient;
		const String16 mClientName;
		};

		class TrackHandle;
		@@ -834,10 +831,6 @@ private:
		bool mIsLowRamDevice;
		bool mIsDeviceTypeKnown;
		nsecs_t mGlobalEffectEnableTime; // when a global effect was last enabled

		// For checking audio record access
		AppOpsManager mAppOpsManager;
		bool checkAudioRecordOp();
		};

		#undef INCLUDING_FROM_AUDIOFLINGER_H

services/audioflinger/PackageManager.cpp

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The CyanogenMod Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <unistd.h>
		#include <binder/IBinder.h>
		#include <binder/IServiceManager.h>
		#include <binder/Parcel.h>
		#include <utils/String16.h>

		#include "PackageManager.h"

		namespace android {

		// This need to be synced with IPackageManager.java
		const uint32_t GET_NAME_FROM_UID_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION + 25;

		String16 getNameForUid(int uid)
		{
		int fd = -1;

		sp<IServiceManager> sm = defaultServiceManager();
		sp<IBinder> pm = sm->getService(String16("package"));
		if (pm != NULL) {
		Parcel data, reply;
		data.writeInterfaceToken(String16("android.content.pm.IPackageManager"));
		data.writeInt32(uid);
		status_t ret = pm->transact(GET_NAME_FROM_UID_TRANSACTION, data, &reply);
		if (ret == NO_ERROR) {
		int32_t exceptionCode = reply.readExceptionCode();
		if (!exceptionCode) {
		return reply.readString16();
		} else {
		// An exception was thrown back; fall through to return failure
		ALOGD("getNameForUid(%d) caught exception %d\n", uid, exceptionCode);
		}
		}
		}
		return String16();
		}

		} /* namespace android */

services/audioflinger/PackageManager.h

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The CyanogenMod Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef PackageManager_H
		#define PackageManager_H

		#include <utils/String16.h>

		namespace android {

		String16 getNameForUid(int uid);

		}

		#endif