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

Commit 94357fda authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Add Flags for VDM everywhere 

Bug: 297220822
Test: atest VirtualDeviceManagerBasicTest
Change-Id: I03d6eb92c638abb1f2c42220bae0cc611b132710
parent 3851af3e

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ java_defaults { 
        ":camera_platform_flags_core_java_lib{.generated_srcjars}",

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

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

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

    ],

}
@@ -92,3 +93,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.os.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// VirtualDeviceManager

java_aconfig_library {

    name: "android.companion.virtual.flags-aconfig-java",

    aconfig_declarations: "android.companion.virtual.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



aconfig_declarations {

    name: "android.companion.virtual.flags-aconfig",

    package: "android.companion.virtual.flags",

    srcs: ["core/java/android/companion/virtual/*.aconfig"],

}

core/java/android/companion/virtual/VirtualDeviceManager.java

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.app.PendingIntent; 
import android.companion.AssociationInfo;

import android.companion.virtual.audio.VirtualAudioDevice;

import android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback;

import android.companion.virtual.flags.Flags;

import android.companion.virtual.sensor.VirtualSensor;

import android.content.ComponentName;

import android.content.Context;
@@ -173,6 +174,9 @@ public final class VirtualDeviceManager { 
            int associationId,

            @NonNull VirtualDeviceParams params) {

        Objects.requireNonNull(params, "params must not be null");

        if (Flags.moreLogs()) {

            Log.i(TAG, "Creating VirtualDevice");

        }

        try {

            return new VirtualDevice(mService, mContext, associationId, params);

        } catch (RemoteException e) {

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

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.companion.virtual.flags"



flag {

  name: "more_logs"

  namespace: "virtual_devices"

  description: "More logs to test flags with"

  bug: "291725823"

}

services/companion/java/com/android/server/companion/virtual/Android.bp

+3 −0
Original line number Diff line number Diff line 
java_aconfig_library {

    name: "virtualdevice_flags_lib",

    aconfig_declarations: "virtualdevice_flags",

    static_libs: [

        "android.companion.virtual.flags-aconfig-java",

    ],

}



aconfig_declarations {

services/companion/java/com/android/server/companion/virtual/VirtualDeviceManagerService.java

+10 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.companion.virtual.IVirtualDeviceSoundEffectListener; 
import android.companion.virtual.VirtualDevice;

import android.companion.virtual.VirtualDeviceManager;

import android.companion.virtual.VirtualDeviceParams;

import android.companion.virtual.flags.Flags;

import android.companion.virtual.sensor.VirtualSensor;

import android.content.AttributionSource;

import android.content.Context;
@@ -323,6 +324,15 @@ public class VirtualDeviceManagerService extends SystemService { 
                @NonNull IVirtualDeviceSoundEffectListener soundEffectListener) {

            createVirtualDevice_enforcePermission();

            attributionSource.enforceCallingUid();

            final long identity = Binder.clearCallingIdentity();

            try {

                if (Flags.moreLogs()) {

                    Slog.i(TAG, "Creating VirtualDevice");

                }

            } finally {

                Binder.restoreCallingIdentity(identity);

            }



            final int callingUid = getCallingUid();

            final String packageName = attributionSource.getPackageName();

            if (!PermissionUtils.validateCallingPackageName(getContext(), packageName)) {