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

Commit 16d021e3 authored by Prem Edhara's avatar Prem Edhara Committed by Android (Google) Code Review
Browse files

Merge "Check VDM flag before accessing" into main

parents 85a91449 7e54c708

core/java/android/app/SystemServiceRegistry.java

+5 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ import android.view.translation.ITranslationManager; 
import android.view.translation.TranslationManager;

import android.view.translation.UiTranslationManager;



import com.android.internal.R;

import com.android.internal.app.IAppOpsService;

import com.android.internal.app.IBatteryStats;

import com.android.internal.app.ISoundTriggerService;
@@ -871,6 +872,10 @@ public final class SystemServiceRegistry { 
                        PackageManager.FEATURE_COMPANION_DEVICE_SETUP)) {

                    return null;

                }

                if (!ctx.getResources().getBoolean(R.bool.config_enableVirtualDeviceManager)) {

                    return null;

                }



                IVirtualDeviceManager service = IVirtualDeviceManager.Stub.asInterface(

                        ServiceManager.getServiceOrThrow(Context.VIRTUAL_DEVICE_SERVICE));

                return new VirtualDeviceManager(service, ctx.getOuterContext());