FIX: Don't switch to hostVT during testing.

[Feature]       FIX: Don't switch to hostVT during testing
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, run tests.

Change-Id: Ic02c2387b15a5a162e88806c2dcc5ec2c82e67b0

diff --git a/server/zones-manager.cpp b/server/zones-manager.cpp
index 7a2bf11..82c5e68 100644 (file)
--- a/server/zones-manager.cpp
+++ b/server/zones-manager.cpp
@@ -392,8 +392,10 @@ void ZonesManager::focusInternal(Zones::iterator iter)
     // assume mutex is locked
     if (iter == mZones.end()) {
         if (!mActiveZoneId.empty()) {
-            LOGI("Focus to: host");
-            utils::activateVT(mConfig.hostVT);
+            if (mConfig.hostVT > 0) {
+                LOGI("Focus to: host");
+                utils::activateVT(mConfig.hostVT);
+            }
             mActiveZoneId.clear();
         }
         return;

diff --git a/tests/unit_tests/configs/test-daemon.conf.in b/tests/unit_tests/configs/test-daemon.conf.in
index 2ed411b..247bf1f 100644 (file)
--- a/tests/unit_tests/configs/test-daemon.conf.in
+++ b/tests/unit_tests/configs/test-daemon.conf.in
@@ -7,7 +7,7 @@
     "zoneTemplateDir" : "@VSM_TEST_CONFIG_INSTALL_DIR@/templates/",
     "runMountPointPrefix" : "",
     "defaultId" : "",
-    "hostVT" : 2,
+    "hostVT" : -1,
     "availableVTs" : [],
     "inputConfig" : {"enabled" : false,
                      "device" : "gpio-keys.4",