Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e973012 authored by Bill Yi's avatar Bill Yi
Browse files

Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE

Merged-In: I3cf9d649a6fd6f9ce320cd720f460033b5ba7d50
Merged-In: I49cf0160d398688d17d96288700faa2755b1b436
Merged-In: I8a3c0e0b29a7b40e7aaffbd5632bbc75f2fa4c75
Change-Id: Ida12a974529352ef053780f463f59269c29885fe
parents 134360bd 95be9bad
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
@@ -793,8 +793,29 @@ Status AudioPolicyService::startInput(int32_t portIdAidl)

    Mutex::Autolock _l(mLock);

    ALOGW_IF(client->silenced, "startInput on silenced input for port %d, uid %d. Unsilencing.",
            portIdAidl,
            client->attributionSource.uid);

    if (client->active) {
        ALOGE("Client should never be active before startInput. Uid %d port %d",
                client->attributionSource.uid, portId);
        finishRecording(client->attributionSource, client->attributes.source);
        return binderStatusFromStatusT(INVALID_OPERATION);
    }

    // Force the possibly silenced client to be unsilenced since we just called
    // startRecording (i.e. we have assumed it is unsilenced).
    // At this point in time, the client is inactive, so no calls to appops are sent in
    // setAppState_l.
    // This ensures existing clients have the same behavior as new clients (starting unsilenced).
    // TODO(b/282076713)
    setAppState_l(client, APP_STATE_TOP);

    client->active = true;
    client->startTimeNs = systemTime();
    // This call updates the silenced state, and since we are active, appropriately notifies appops
    // if we silence the track.
    updateUidStates_l();

    status_t status;