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

Commit c4f825d8 authored by Marvin Ramin's avatar Marvin Ramin Committed by Android (Google) Code Review
Browse files

Merge "Remove virtual_devices more_logs flag" into main

parents 1822ab17 9458a6a6

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -185,9 +185,6 @@ public final class VirtualDeviceManager { 
            int associationId,

            int associationId,

            @NonNull VirtualDeviceParams params) {

            @NonNull VirtualDeviceParams params) {

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

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

        if (Flags.moreLogs()) {

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

        }

        try {

        try {

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

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

        } catch (RemoteException e) {

        } catch (RemoteException e) {

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

+0 −7
Original line number Original line Diff line number Diff line 
package: "android.companion.virtual.flags"

package: "android.companion.virtual.flags"





flag {

  name: "more_logs"

  namespace: "virtual_devices"

  description: "More logs to test flags with"

  bug: "291725823"

}



flag {

flag {

  name: "enable_native_vdm"

  name: "enable_native_vdm"

  namespace: "virtual_devices"

  namespace: "virtual_devices"

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -361,14 +361,6 @@ public class VirtualDeviceManagerService extends SystemService { 
                @NonNull IVirtualDeviceSoundEffectListener soundEffectListener) {

                @NonNull IVirtualDeviceSoundEffectListener soundEffectListener) {

            createVirtualDevice_enforcePermission();

            createVirtualDevice_enforcePermission();

            attributionSource.enforceCallingUid();

            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 int callingUid = getCallingUid();

            final String packageName = attributionSource.getPackageName();

            final String packageName = attributionSource.getPackageName();