commit 6e6aeddd9490cbd9f4117d003d14b75c7df8471f
author Eric Laurent <elaurent@google.com> Fri Oct 21 11:36:32 2022 +0200
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Oct 27 02:14:03 2022 +0000
tree 6e76be5d4e711c165001dac6c4296831b24b8be1
parent 94e8f740c97d8b7d7c550c03b46a45c3375fb369

Revert "audio: fix missing package name in attribution source"

This reverts commit 063c4ed57a6e5557fd81b612b0d960942f480c8e.

This fix is indirectly causing problems with UIDs without
associated package names like trusted hotword.
Reverting until a good solution is found for this particular
case.

Bug: 254403803
Bug: 243376549
Test: manual Hotword regression
Change-Id: Ib19afd740e10d8bc26fc173641f7463719d079fd
(cherry picked from commit c5166b2ae00520263d22ffd8f954bb8259d20258)
Merged-In: Ib19afd740e10d8bc26fc173641f7463719d079fd

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 56ad3a6..4653f96 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -1067,8 +1067,6 @@
         clientPid = callingPid;
         adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
     }
-    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(
-            adjAttributionSource);
 
     audio_session_t sessionId = input.sessionId;
     if (sessionId == AUDIO_SESSION_ALLOCATE) {
@@ -2291,8 +2289,7 @@
                  __func__, callingUid, callingPid, currentPid);
         adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
     }
-    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(
-            adjAttributionSource);
+
     // we don't yet support anything other than linear PCM
     if (!audio_is_valid_format(input.config.format) || !audio_is_linear_pcm(input.config.format)) {
         ALOGE("createRecord() invalid format %#x", input.config.format);
@@ -3917,7 +3914,6 @@
         adjAttributionSource.pid = VALUE_OR_RETURN_STATUS(legacy2aidl_pid_t_int32_t(callingPid));
         currentPid = callingPid;
     }
-    adjAttributionSource = AudioFlinger::checkAttributionSourcePackage(adjAttributionSource);
 
     ALOGV("createEffect pid %d, effectClient %p, priority %d, sessionId %d, io %d, factory %p",
           adjAttributionSource.pid, effectClient.get(), priority, sessionId, io,