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

Commit aae8353e authored by Prem's avatar Prem Committed by Prem Edhara
Browse files

Add config to enable / disable VirtualDeviceManager 

Bug:287295010

Test: Flashed watch and saw VDM was started also tested case where the flag was set to false.

Change-Id: I3126aa76d7239f1e7c86c7b869e7e79651df079a
parent 6df6883a

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -198,6 +198,9 @@ 
         service. Off by default, since the service may not be available on some devices. -->

    <bool name="config_enableProximityService">false</bool>



    <!-- Enable or disable android.companion.virtual.VirtualDeviceManager. Enabled by default. -->

    <bool name="config_enableVirtualDeviceManager">true</bool>



    <!-- Whether dialogs should close automatically when the user touches outside

         of them.  This should not normally be modified. -->

    <bool name="config_closeDialogWhenTouchOutside">true</bool>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ 
  <java-symbol type="bool" name="config_localDisplaysMirrorContent" />

  <java-symbol type="bool" name="config_ignoreUdfpsVote" />

  <java-symbol type="bool" name="config_enableProximityService" />

  <java-symbol type="bool" name="config_enableVirtualDeviceManager" />

  <java-symbol type="array" name="config_localPrivateDisplayPorts" />

  <java-symbol type="integer" name="config_defaultDisplayDefaultColorMode" />

  <java-symbol type="bool" name="config_enableAppWidgetService" />

services/java/com/android/server/SystemServer.java

+2 −1
Original line number Diff line number Diff line
@@ -2440,8 +2440,9 @@ public final class SystemServer implements Dumpable { 
                t.traceBegin("StartCompanionDeviceManager");

                mSystemServiceManager.startService(COMPANION_DEVICE_MANAGER_SERVICE_CLASS);

                t.traceEnd();

            }



                // VirtualDeviceManager depends on CDM to control the associations.

            if (context.getResources().getBoolean(R.bool.config_enableVirtualDeviceManager)) {

                t.traceBegin("StartVirtualDeviceManager");

                mSystemServiceManager.startService(VIRTUAL_DEVICE_MANAGER_SERVICE_CLASS);

                t.traceEnd();