commit 55532058d87e0199c9ed95930d87a8c42f5dcf7e
author Pechetty Sravani <pechetty@google.com> Fri Jun 14 03:30:13 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 14 03:30:13 2024 +0000
tree 0487d0e7ab7f655160d11bd5988095281c9336b8
parent 07c665d8060670be0403a1e4f05e5b727355ded3

Revert "Migrate audioflinger package validation"

This reverts commit 07c665d8060670be0403a1e4f05e5b727355ded3.

Reason for revert: Droidmonitor triggered revert due to test breakage in b/347112633. Will be verifying through ABTD before submission.

Change-Id: I7f531f5c0a0450b8f36e53442eac18b1baa32117

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index ca5bb36..66e89e4 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -72,7 +72,6 @@
 #include <media/nbaio/Pipe.h>
 #include <media/nbaio/PipeReader.h>
 #include <media/nbaio/SourceAudioBufferProvider.h>
-#include <media/ValidatedAttributionSourceState.h>
 #include <mediautils/BatteryNotifier.h>
 #include <mediautils/Process.h>
 #include <mediautils/SchedulingPolicyService.h>
@@ -121,8 +120,6 @@
     return a < b ? a : b;
 }
 
-using com::android::media::permission::ValidatedAttributionSourceState;
-
 namespace android {
 
 using audioflinger::SyncEvent;
@@ -10294,23 +10291,8 @@
     audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE;
 
     audio_io_handle_t io = mId;
-    AttributionSourceState adjAttributionSource;
-    if (!com::android::media::audio::audioserver_permissions()) {
-        adjAttributionSource = afutils::checkAttributionSourcePackage(
-                client.attributionSource);
-    } else {
-        // TODO(b/342475009) validate in oboeservice, and plumb downwards
-        auto validatedRes = ValidatedAttributionSourceState::createFromTrustedUidNoPackage(
-                    client.attributionSource,
-                    mAfThreadCallback->getPermissionProvider()
-                );
-        if (!validatedRes.has_value()) {
-            ALOGE("MMAP client package validation fail: %s",
-                    validatedRes.error().toString8().c_str());
-            return aidl_utils::statusTFromBinderStatus(validatedRes.error());
-        }
-        adjAttributionSource = std::move(validatedRes.value()).unwrapInto();
-    }
+    const AttributionSourceState adjAttributionSource = afutils::checkAttributionSourcePackage(
+            client.attributionSource);
 
     const auto localSessionId = mSessionId;
     auto localAttr = mAttr;