diff options
| author | Glenn Kasten <gkasten@google.com> | 2011-05-23 09:06:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-23 09:06:03 -0700 |
| commit | bdd8a16282cf85bfdbe4c15adcd5c37db772de11 (patch) | |
| tree | 4571909fba4d95fab12f9e59d0adb44fcdb4c4c5 /services | |
| parent | 8508485871dd22a998db98ea97403126918c5fa8 (diff) | |
| parent | f0e95696c03d9b2dca6a301a767071cf599a2845 (diff) | |
| download | frameworks_base-bdd8a16282cf85bfdbe4c15adcd5c37db772de11.zip frameworks_base-bdd8a16282cf85bfdbe4c15adcd5c37db772de11.tar.gz frameworks_base-bdd8a16282cf85bfdbe4c15adcd5c37db772de11.tar.bz2 | |
Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index a6ba1a0..8e86eda 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -87,40 +87,20 @@ static const int kDumpLockSleep = 20000; static const nsecs_t kWarningThrottle = seconds(5); -#define AUDIOFLINGER_SECURITY_ENABLED 1 - // ---------------------------------------------------------------------------- static bool recordingAllowed() { -#ifndef HAVE_ANDROID_OS - return true; -#endif -#if AUDIOFLINGER_SECURITY_ENABLED if (getpid() == IPCThreadState::self()->getCallingPid()) return true; bool ok = checkCallingPermission(String16("android.permission.RECORD_AUDIO")); if (!ok) LOGE("Request requires android.permission.RECORD_AUDIO"); return ok; -#else - if (!checkCallingPermission(String16("android.permission.RECORD_AUDIO"))) - LOGW("WARNING: Need to add android.permission.RECORD_AUDIO to manifest"); - return true; -#endif } static bool settingsAllowed() { -#ifndef HAVE_ANDROID_OS - return true; -#endif -#if AUDIOFLINGER_SECURITY_ENABLED if (getpid() == IPCThreadState::self()->getCallingPid()) return true; bool ok = checkCallingPermission(String16("android.permission.MODIFY_AUDIO_SETTINGS")); if (!ok) LOGE("Request requires android.permission.MODIFY_AUDIO_SETTINGS"); return ok; -#else - if (!checkCallingPermission(String16("android.permission.MODIFY_AUDIO_SETTINGS"))) - LOGW("WARNING: Need to add android.permission.MODIFY_AUDIO_SETTINGS to manifest"); - return true; -#endif } // To collect the amplifier usage |