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

Commit 81686a96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make VirtualAudioDevice device-aware" into main

parents 3e8b1e6f 2f1c2023

AconfigFlags.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ aconfig_srcjars = [ 
    ":android.chre.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.virtual.flags-aconfig-java{.generated_srcjars}",

    ":android.companion.virtualdevice.flags-aconfig-java{.generated_srcjars}",

    ":android.content.flags-aconfig-java{.generated_srcjars}",

    ":android.content.pm.flags-aconfig-java{.generated_srcjars}",

    ":android.content.res.flags-aconfig-java{.generated_srcjars}",

core/java/android/companion/virtual/VirtualDeviceInternal.java

+6 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.companion.virtual.audio.VirtualAudioDevice; 
import android.companion.virtual.camera.VirtualCamera;

import android.companion.virtual.camera.VirtualCameraConfig;

import android.companion.virtual.sensor.VirtualSensor;

import android.companion.virtualdevice.flags.Flags;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;
@@ -351,7 +352,11 @@ public class VirtualDeviceInternal { 
            @Nullable Executor executor,

            @Nullable VirtualAudioDevice.AudioConfigurationChangeCallback callback) {

        if (mVirtualAudioDevice == null) {

            mVirtualAudioDevice = new VirtualAudioDevice(mContext, mVirtualDevice, display,

            Context context = mContext;

            if (Flags.deviceAwareRecordAudioPermission()) {

                context = mContext.createDeviceContext(getDeviceId());

            }

            mVirtualAudioDevice = new VirtualAudioDevice(context, mVirtualDevice, display,

                    executor, callback, () -> mVirtualAudioDevice = null);

        }

        return mVirtualAudioDevice;

core/java/android/companion/virtual/flags/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -21,3 +21,11 @@ flag { 
     description: "Enable discovery of the Virtual Camera HAL without a VINTF entry"

     bug: "305170199"

}



flag {

     namespace: "virtual_devices"

     name: "device_aware_record_audio_permission"

     description: "Enable device-aware RECORD_AUDIO permission"

     bug: "291737188"

     is_fixed_read_only: true

}