diff options
| author | Woo Chang Kim <wchang.kim@samsung.com> | 2019-07-31 02:37:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-07-31 02:37:16 +0000 |
| commit | bb10c5178bb85961261f43b319a12dae05a998f7 (patch) | |
| tree | 2db9aad38b969d5332e8116634a412d1c7d027bd | |
| parent | d1a0f72f5ab74e036f1a3ba3e4a1dde20a016e41 (diff) | |
| parent | b3797444f7b462c2b262c2d96ba643ba811d20e1 (diff) | |
| download | unified-model-config-bb10c5178bb85961261f43b319a12dae05a998f7.tar.gz unified-model-config-bb10c5178bb85961261f43b319a12dae05a998f7.tar.bz2 unified-model-config-bb10c5178bb85961261f43b319a12dae05a998f7.zip | |
Merge "[ACR-1382] Newly add machine_learning feature" into tizensubmit/tizen/20190731.023856accepted/tizen/unified/20190731.215831
| -rw-r--r-- | emulator/model-config.xml | 2 | ||||
| -rw-r--r-- | emulator/model-config_mobile.xml | 2 | ||||
| -rw-r--r-- | emulator/model-config_mobile64.xml | 2 | ||||
| -rw-r--r-- | emulator/model-config_tv.xml | 2 | ||||
| -rw-r--r-- | emulator/model-config_tv64.xml | 2 | ||||
| -rw-r--r-- | emulator/model-config_wearable.xml | 2 | ||||
| -rw-r--r-- | generic/model-config-iot.xml | 2 | ||||
| -rw-r--r-- | generic/model-config.xml | 2 | ||||
| -rw-r--r-- | rpi3/model-config.xml | 2 | ||||
| -rw-r--r-- | rpi3/model-config_tv.xml | 2 | ||||
| -rw-r--r-- | tm1/model-config.xml | 2 | ||||
| -rw-r--r-- | tm2/model-config.xml | 2 | ||||
| -rw-r--r-- | tw2/model-config.xml | 2 | ||||
| -rw-r--r-- | tw3/model-config.xml | 2 | ||||
| -rw-r--r-- | xu3/model-config.xml | 2 | ||||
| -rw-r--r-- | xu3/model-config_ivi.xml | 2 | ||||
| -rw-r--r-- | xu3/model-config_tv.xml | 2 |
17 files changed, 34 insertions, 0 deletions
diff --git a/emulator/model-config.xml b/emulator/model-config.xml index bbc7fc8..b0a0ccc 100644 --- a/emulator/model-config.xml +++ b/emulator/model-config.xml @@ -31,6 +31,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">true</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">true</key> diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml index 516da6d..c2de24b 100644 --- a/emulator/model-config_mobile.xml +++ b/emulator/model-config_mobile.xml @@ -50,6 +50,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">true</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">true</key> diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml index 6d1cd19..78c991f 100644 --- a/emulator/model-config_mobile64.xml +++ b/emulator/model-config_mobile64.xml @@ -50,6 +50,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">true</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">true</key> diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml index 908389b..58959d1 100644 --- a/emulator/model-config_tv.xml +++ b/emulator/model-config_tv.xml @@ -51,6 +51,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml index c7972b3..7fb6d0e 100644 --- a/emulator/model-config_tv64.xml +++ b/emulator/model-config_tv64.xml @@ -49,6 +49,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml index 6d0bc97..bfad388 100644 --- a/emulator/model-config_wearable.xml +++ b/emulator/model-config_wearable.xml @@ -50,6 +50,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.image_capture" type="bool">true</key> diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml index 3400fdd..22a5b8e 100644 --- a/generic/model-config-iot.xml +++ b/generic/model-config-iot.xml @@ -48,6 +48,8 @@ <key name="tizen.org/feature/location.gps" type="bool">false</key> <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/maps" type="bool">false</key> <key name="tizen.org/feature/media.audio_recording" type="bool">false</key> <key name="tizen.org/feature/media.image_capture" type="bool">false</key> diff --git a/generic/model-config.xml b/generic/model-config.xml index b9a8c34..212d3cb 100644 --- a/generic/model-config.xml +++ b/generic/model-config.xml @@ -23,6 +23,8 @@ <key name="tizen.org/feature/location" type="bool">false</key> <key name="tizen.org/feature/location.gps" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/microphone" type="bool">true</key> <key name="tizen.org/feature/multi_assistant" type="bool">true</key> <key name="tizen.org/feature/multi_point_touch.pinch_zoom" type="bool">true</key> diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml index a744c9a..06f5f5e 100644 --- a/rpi3/model-config.xml +++ b/rpi3/model-config.xml @@ -43,6 +43,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml index 41d62eb..d0e8185 100644 --- a/rpi3/model-config_tv.xml +++ b/rpi3/model-config_tv.xml @@ -43,6 +43,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/tm1/model-config.xml b/tm1/model-config.xml index 2248637..216b638 100644 --- a/tm1/model-config.xml +++ b/tm1/model-config.xml @@ -50,6 +50,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">true</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">true</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">true</key> diff --git a/tm2/model-config.xml b/tm2/model-config.xml index b9678e3..1a9349e 100644 --- a/tm2/model-config.xml +++ b/tm2/model-config.xml @@ -50,6 +50,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">true</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">true</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">true</key> diff --git a/tw2/model-config.xml b/tw2/model-config.xml index 1eac695..2a9c1d7 100644 --- a/tw2/model-config.xml +++ b/tw2/model-config.xml @@ -49,6 +49,8 @@ <key name="tizen.org/feature/location.gps" type="bool">true</key> <key name="tizen.org/feature/location.gps.satellite" type="bool">true</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.image_capture" type="bool">false</key> diff --git a/tw3/model-config.xml b/tw3/model-config.xml index d9f67d0..43777de 100644 --- a/tw3/model-config.xml +++ b/tw3/model-config.xml @@ -49,6 +49,8 @@ <key name="tizen.org/feature/location.gps" type="bool">true</key> <key name="tizen.org/feature/location.gps.satellite" type="bool">true</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.image_capture" type="bool">false</key> diff --git a/xu3/model-config.xml b/xu3/model-config.xml index 0fda319..1d3e0e5 100644 --- a/xu3/model-config.xml +++ b/xu3/model-config.xml @@ -49,6 +49,8 @@ <key name="tizen.org/feature/location.gps" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">false</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml index a01d0f8..9040717 100644 --- a/xu3/model-config_ivi.xml +++ b/xu3/model-config_ivi.xml @@ -41,6 +41,8 @@ <key name="tizen.org/feature/location.gps" type="bool">true</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">false</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">false</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">true</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml index 5489557..8edb906 100644 --- a/xu3/model-config_tv.xml +++ b/xu3/model-config_tv.xml @@ -51,6 +51,8 @@ <key name="tizen.org/feature/location.gps.satellite" type="bool">false</key> <key name="tizen.org/feature/location.wps" type="bool">false</key> <key name="tizen.org/feature/location.geofence" type="bool">false</key> + <key name="tizen.org/feature/machine_learning" type="bool">true</key> + <key name="tizen.org/feature/machine_learning.inference" type="bool">true</key> <key name="tizen.org/feature/maps" type="bool">true</key> <key name="tizen.org/feature/media.audio_recording" type="bool">false</key> <key name="tizen.org/feature/media.video_recording" type="bool">false</key> |