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

Commit 82f094f6 authored by Atneya Nair's avatar Atneya Nair Committed by Android (Google) Code Review
Browse files

Merge "AudioDeviceBroker: fix UID comparison for phone/bt process for HSUM" into main

parents 80a4816d 010f5e7f

services/core/java/com/android/server/audio/AudioDeviceBroker.java

+3 −2
Original line number Diff line number Diff line
@@ -384,11 +384,12 @@ public class AudioDeviceBroker { 
    /**

     * Indicates if a Bluetooth SCO activation request owner is controlling

     * the SCO audio state itself or not.

     * @param uid the UI of the SOC request owner app

     * @param uid the UID of the SOC request owner app

     * @return true if we should control SCO audio state, false otherwise

     */

    private boolean shouldStartScoForUid(int uid) {

        return !(uid == Process.BLUETOOTH_UID || uid == Process.PHONE_UID);

        return !(UserHandle.isSameApp(uid, Process.BLUETOOTH_UID)

                || UserHandle.isSameApp(uid, Process.PHONE_UID));

    }



    @GuardedBy("mDeviceStateLock")