diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 8033382..229e08e 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3051,7 +3051,6 @@
 
         // check recording permission for visualizer
         if ((memcmp(&desc.type, SL_IID_VISUALIZATION, sizeof(effect_uuid_t)) == 0) &&
-            // TODO: Do we need to start/stop op - i.e. is there recording being performed?
             !recordingAllowed(opPackageName, pid, IPCThreadState::self()->getCallingUid())) {
             lStatus = PERMISSION_DENIED;
             goto Exit;
diff --git a/services/audioflinger/ServiceUtilities.cpp b/services/audioflinger/ServiceUtilities.cpp
index 84b43ce..f08698e 100644
--- a/services/audioflinger/ServiceUtilities.cpp
+++ b/services/audioflinger/ServiceUtilities.cpp
@@ -30,8 +30,6 @@
 
 namespace android {
 
-static const String16 sAndroidPermissionRecordAudio("android.permission.RECORD_AUDIO");
-
 // Not valid until initialized by AudioFlinger constructor.  It would have to be
 // re-initialized if the process containing AudioFlinger service forks (which it doesn't).
 // This is often used to validate binder interface calls within audioserver
@@ -51,72 +49,25 @@
 }
 
 bool recordingAllowed(const String16& opPackageName, pid_t pid, uid_t uid) {
-    return checkRecordingInternal(opPackageName, pid, uid, false);
-}
+    // we're always OK.
+    if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;
 
-bool startRecording(const String16& opPackageName, pid_t pid, uid_t uid) {
-     return checkRecordingInternal(opPackageName, pid, uid, true);
-}
+    static const String16 sRecordAudio("android.permission.RECORD_AUDIO");
 
-bool checkRecordingInternal(const String16& opPackageName, pid_t pid, uid_t uid, bool start) {
-     // we're always OK.
-     if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;
-
-     // To permit command-line native tests
-     if (uid == AID_ROOT) return true;
-
-     // We specify a pid and uid here as mediaserver (aka MediaRecorder or StageFrightRecorder)
-     // may open a record track on behalf of a client.  Note that pid may be a tid.
-     // IMPORTANT: DON'T USE PermissionCache - RUNTIME PERMISSIONS CHANGE.
-     PermissionController permissionController;
-     const bool ok = permissionController.checkPermission(sAndroidPermissionRecordAudio, pid, uid);
-     if (!ok) {
-         ALOGE("Request requires %s", String8(sAndroidPermissionRecordAudio).c_str());
-         return false;
-     }
-
-     const String16 resolvedOpPackageName = resolveCallingPackage(
-             permissionController, opPackageName, uid);
-     if (opPackageName.size() <= 0) {
-         return false;
-     }
-
-     AppOpsManager appOps;
-     const int32_t op = appOps.permissionToOpCode(sAndroidPermissionRecordAudio);
-     if (start) {
-         if (appOps.startOpNoThrow(op, uid, resolvedOpPackageName, /*startIfModeDefault*/ false)
-                 != AppOpsManager::MODE_ALLOWED) {
-             ALOGE("Request denied by app op: %d", op);
-             return false;
-         }
-     } else {
-         if (appOps.noteOp(op, uid, resolvedOpPackageName) != AppOpsManager::MODE_ALLOWED) {
-             ALOGE("Request denied by app op: %d", op);
-             return false;
-         }
-     }
-
-     return true;
-}
-
-void finishRecording(const String16& opPackageName, uid_t uid) {
-    PermissionController permissionController;
-    const String16 resolvedOpPackageName = resolveCallingPackage(
-            permissionController, opPackageName, uid);
-    if (opPackageName.size() <= 0) {
-        return;
+    // We specify a pid and uid here as mediaserver (aka MediaRecorder or StageFrightRecorder)
+    // may open a record track on behalf of a client.  Note that pid may be a tid.
+    // IMPORTANT: Don't use PermissionCache - a runtime permission and may change.
+    const bool ok = checkPermission(sRecordAudio, pid, uid);
+    if (!ok) {
+        ALOGE("Request requires android.permission.RECORD_AUDIO");
+        return false;
     }
 
-    AppOpsManager appOps;
-    const int32_t op = appOps.permissionToOpCode(sAndroidPermissionRecordAudio);
-    appOps.finishOp(op, uid, resolvedOpPackageName);
-}
+    // To permit command-line native tests
+    if (uid == AID_ROOT) return true;
 
-const String16 resolveCallingPackage(PermissionController& permissionController,
-        const String16& opPackageName, uid_t uid) {
-    if (opPackageName.size() > 0) {
-        return opPackageName;
-    }
+    String16 checkedOpPackageName = opPackageName;
+
     // In some cases the calling code has no access to the package it runs under.
     // For example, code using the wilhelm framework's OpenSL-ES APIs. In this
     // case we will get the packages for the calling UID and pick the first one
@@ -124,19 +75,40 @@
     // as for legacy apps we will toggle the app op for all packages in the UID.
     // The caveat is that the operation may be attributed to the wrong package and
     // stats based on app ops may be slightly off.
-    Vector<String16> packages;
-    permissionController.getPackagesForUid(uid, packages);
-    if (packages.isEmpty()) {
-        ALOGE("No packages for uid %d", uid);
-        return opPackageName;
+    if (checkedOpPackageName.size() <= 0) {
+        sp<IServiceManager> sm = defaultServiceManager();
+        sp<IBinder> binder = sm->getService(String16("permission"));
+        if (binder == 0) {
+            ALOGE("Cannot get permission service");
+            return false;
+        }
+
+        sp<IPermissionController> permCtrl = interface_cast<IPermissionController>(binder);
+        Vector<String16> packages;
+
+        permCtrl->getPackagesForUid(uid, packages);
+
+        if (packages.isEmpty()) {
+            ALOGE("No packages for calling UID");
+            return false;
+        }
+        checkedOpPackageName = packages[0];
     }
-    return packages[0];
+
+    AppOpsManager appOps;
+    if (appOps.noteOp(AppOpsManager::OP_RECORD_AUDIO, uid, checkedOpPackageName)
+            != AppOpsManager::MODE_ALLOWED) {
+        ALOGE("Request denied by app op OP_RECORD_AUDIO");
+        return false;
+    }
+
+    return true;
 }
 
 bool captureAudioOutputAllowed(pid_t pid, uid_t uid) {
     if (getpid_cached == IPCThreadState::self()->getCallingPid()) return true;
     static const String16 sCaptureAudioOutput("android.permission.CAPTURE_AUDIO_OUTPUT");
-    bool ok = PermissionCache::checkPermission(sCaptureAudioOutput, pid, uid);
+    bool ok = checkPermission(sCaptureAudioOutput, pid, uid);
     if (!ok) ALOGE("Request requires android.permission.CAPTURE_AUDIO_OUTPUT");
     return ok;
 }
@@ -183,7 +155,7 @@
 
 bool modifyPhoneStateAllowed(pid_t pid, uid_t uid) {
     static const String16 sModifyPhoneState("android.permission.MODIFY_PHONE_STATE");
-    bool ok = PermissionCache::checkPermission(sModifyPhoneState, pid, uid);
+    bool ok = checkPermission(sModifyPhoneState, pid, uid);
     if (!ok) ALOGE("Request requires android.permission.MODIFY_PHONE_STATE");
     return ok;
 }
diff --git a/services/audioflinger/ServiceUtilities.h b/services/audioflinger/ServiceUtilities.h
index 8f96282..83533dd 100644
--- a/services/audioflinger/ServiceUtilities.h
+++ b/services/audioflinger/ServiceUtilities.h
@@ -16,19 +16,11 @@
 
 #include <unistd.h>
 
-#include <binder/PermissionController.h>
-
 namespace android {
 
 extern pid_t getpid_cached;
 bool isTrustedCallingUid(uid_t uid);
 bool recordingAllowed(const String16& opPackageName, pid_t pid, uid_t uid);
-bool startRecording(const String16& opPackageName, pid_t pid, uid_t uid);
-void finishRecording(const String16& opPackageName, uid_t uid);
-// DON'T USE THIS INTERNAL METHOD
-bool checkRecordingInternal(const String16& opPackageName, pid_t pid, uid_t uid, bool start);
-const String16 resolveCallingPackage(PermissionController& permissionController,
-        const String16& opPackageName, uid_t uid);
 bool captureAudioOutputAllowed(pid_t pid, uid_t uid);
 bool captureHotwordAllowed(pid_t pid, uid_t uid);
 bool settingsAllowed();
diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index d04b21e..306de3f 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -412,7 +412,7 @@
     }
 
     // check calling permissions
-    if (!startRecording(client->opPackageName, client->pid, client->uid)) {
+    if (!recordingAllowed(client->opPackageName, client->pid, client->uid)) {
         ALOGE("%s permission denied: recording not allowed for uid %d pid %d",
                 __func__, client->uid, client->pid);
         return PERMISSION_DENIED;
@@ -457,9 +457,6 @@
     }
     sp<AudioRecordClient> client = mAudioRecordClients.valueAt(index);
 
-    // finish the recording app op
-    finishRecording(client->opPackageName, client->uid);
-
     return mAudioPolicyManager->stopInput(client->input, client->session);
 }