Merge "[IOT] Disable tethering feature" into tizen

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index 13a1f45..dc39b6f 100644 (file)
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -197,8 +197,13 @@
                <key name="tizen.org/feature/ui_service.sticker" type="bool">false</key>
                <key name="tizen.org/feature/usb.accessory" type="bool">false</key>
                <key name="tizen.org/feature/usb.host" type="bool">false</key>
+               <key name="tizen.org/feature/vision.barcode_detection" type="bool">false</key>
+               <key name="tizen.org/feature/vision.barcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index c0cea1f..1aef9c9 100644 (file)
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -235,6 +235,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index 205d411..9d6f0dc 100644 (file)
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -235,6 +235,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index a79317a..b394b5b 100644 (file)
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -233,6 +233,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index 4c408c9..c6a795d 100644 (file)
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -230,6 +230,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index 8b7c618..dea3046 100644 (file)
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -238,6 +238,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">true</key>

diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index 2165096..6e08b55 100644 (file)
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -260,6 +260,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vulkan.version.1_0" type="bool">false</key>

diff --git a/generic/model-config.xml b/generic/model-config.xml
index c0e3994..4c82adb 100644 (file)
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -114,8 +114,13 @@
                <key name="tizen.org/feature/ui_service.sticker" type="bool">false</key>
                <key name="tizen.org/feature/usb.accessory" type="bool">true</key>
                <key name="tizen.org/feature/usb.host" type="bool">true</key>
+               <key name="tizen.org/feature/vision.barcode_detection" type="bool">false</key>
+               <key name="tizen.org/feature/vision.barcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">false</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/system/sound.media.volume.resolution.max" type="int">15</key>

diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index 837165b..e23d695 100644 (file)
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -234,6 +234,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index c04c5b7..665d7ef 100644 (file)
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -226,6 +226,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index 4f75bc2..d946ac2 100644 (file)
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -236,6 +236,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index adb6ca9..395d45b 100644 (file)
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -237,6 +237,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/vulkan.version.1_0" type="bool">true</key>

diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index bdb2dd6..dc80349 100644 (file)
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -238,6 +238,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">true</key>

diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 3d03cda..5b201d9 100644 (file)
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -238,6 +238,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">true</key>

diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index b571f79..dd15eef 100644 (file)
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -236,6 +236,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index 96407ef..9cd308d 100644 (file)
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -223,6 +223,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>

diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index 2abd446..0ec43d9 100644 (file)
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -238,6 +238,9 @@
                <key name="tizen.org/feature/vision.barcode_generation" type="bool">true</key>
                <key name="tizen.org/feature/vision.face_recognition" type="bool">true</key>
                <key name="tizen.org/feature/vision.image_recognition" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.image" type="bool">true</key>
+               <key name="tizen.org/feature/vision.inference.face" type="bool">true</key>
                <key name="tizen.org/feature/vision.qrcode_generation" type="bool">false</key>
                <key name="tizen.org/feature/vision.qrcode_recognition" type="bool">false</key>
                <key name="tizen.org/feature/watch_app" type="bool">false</key>