From 40cdc4e89a331f1b98326cbf9f9f9db25b87167f Mon Sep 17 00:00:00 2001
From: wchang kim <wchang.kim@samsung.com>
Date: Wed, 25 Mar 2020 08:39:02 +0900
Subject: [PATCH 01/16] Change features of iot to integrate the ref. target

Change-Id: I45199c63eea62ab64cdff3f08c3c5ddffabddbf7
---
 generic/model-config-iot.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index af62a4b..94b2596 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -16,7 +16,7 @@
 		<key name="tizen.org/feature/attach_panel" type="bool">false</key>
 		<key name="tizen.org/feature/badge" type="bool">false</key>
 		<key name="tizen.org/feature/battery" type="bool">false</key>
-		<key name="tizen.org/feature/bookmark" type="bool">false</key>
+		<key name="tizen.org/feature/bookmark" type="bool">true</key>
 		<key name="tizen.org/feature/calendar" type="bool">false</key>
 		<key name="tizen.org/feature/camera" type="bool">false</key>
 		<key name="tizen.org/feature/camera.back" type="bool">false</key>
@@ -134,7 +134,7 @@
 		<key name="tizen.org/feature/network.inm" type="bool">false</key>
 		<key name="tizen.org/feature/network.vpn" type="bool">false</key>
 		<key name="tizen.org/feature/network.zigbee" type="bool">false</key>
-		<key name="tizen.org/feature/nlp" type="bool">false</key>
+		<key name="tizen.org/feature/nlp" type="bool">true</key>
 		<key name="tizen.org/feature/notification" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
@@ -277,13 +277,13 @@
 		<key name="tizen.org/feature/watch_app" type="bool">false</key>
 		<key name="tizen.org/feature/web.ime" type="bool">false</key>
 		<key name="tizen.org/feature/web.service" type="bool">false</key>
-		<key name="tizen.org/feature/websetting" type="bool">false</key>
+		<key name="tizen.org/feature/websetting" type="bool">true</key>
 		<key name="tizen.org/system/sound.media.volume.resolution.max" type="int">15</key>
 		<key name="tizen.org/system/sound.notification.volume.resolution.max" type="int">15</key>
 		<key name="tizen.org/system/sound.ringtone.volume.resolution.max" type="int">15</key>
 		<key name="tizen.org/system/sound.system.volume.resolution.max" type="int">15</key>
-		<key name="tizen.org/system/input.key.volume" type="bool">false</key>
-		<key name="tizen.org/system/input.key.menu" type="bool">false</key>
+		<key name="tizen.org/system/input.key.volume" type="bool">true</key>
+		<key name="tizen.org/system/input.key.menu" type="bool">true</key>
 		<key name="tizen.org/system/input.key.back" type="bool">false</key>
 		<key name="tizen.org/system/tizenid" type="string">none</key>
 		<key name="tizen.org/feature/oauth2" type="bool">false</key>
-- 
2.7.4


From 21701dbb0b7b36a9eb3a290f344a803fc53b9e49 Mon Sep 17 00:00:00 2001
From: Hyunsoo Park <hance.park@samsung.com>
Date: Mon, 23 Mar 2020 17:50:45 +0900
Subject: [PATCH 02/16] Add
 "http://tizen.org/feature/multimedia.stream_recorder" feature

Change-Id: I03075684a4a739a27ae236d7fe93fe1af5366f27
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>
---
 emulator/model-config.xml          | 1 +
 emulator/model-config_mobile.xml   | 1 +
 emulator/model-config_mobile64.xml | 1 +
 emulator/model-config_tv.xml       | 1 +
 emulator/model-config_tv64.xml     | 1 +
 emulator/model-config_wearable.xml | 1 +
 generic/model-config-iot.xml       | 1 +
 generic/model-config.xml           | 1 +
 rpi3/model-config.xml              | 1 +
 rpi3/model-config_tv.xml           | 1 +
 tm1/model-config.xml               | 1 +
 tm2/model-config.xml               | 1 +
 tw2/model-config.xml               | 1 +
 tw3/model-config.xml               | 1 +
 xu3/model-config.xml               | 1 +
 xu3/model-config_ivi.xml           | 1 +
 xu3/model-config_tv.xml            | 1 +
 17 files changed, 17 insertions(+)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index dc39b6f..afaf1d7 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -44,6 +44,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index 1aef9c9..1ca48a6 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -63,6 +63,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index 9d6f0dc..d091857 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -63,6 +63,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index b394b5b..6a24b77 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -64,6 +64,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index c6a795d..f18d160 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -62,6 +62,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index c834991..c320dc0 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -65,6 +65,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index af62a4b..381dfff 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -68,6 +68,7 @@
 		<key name="tizen.org/feature/multi_point_touch.point_count" type="int">2</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index 4c82adb..6470c0d 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -26,6 +26,7 @@
 		<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/multimedia.stream_recorder" type="bool">false</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>
 		<key name="tizen.org/feature/multi_point_touch.point_count" type="int">2</key>
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index b79b050..a010e94 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -56,6 +56,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index 478c59e..85bc41a 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -56,6 +56,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index d946ac2..196b3b4 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -63,6 +63,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">true</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index 395d45b..e012694 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -63,6 +63,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">true</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index b3d3309..086de49 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -64,6 +64,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index a912e48..08ec1f1 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -64,6 +64,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index dd15eef..561ca0b 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -62,6 +62,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index 23477db..5fbdc88 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -53,6 +53,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index 0ec43d9..44de35b 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -64,6 +64,7 @@
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.custom_audio_effect" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.media_codec" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
-- 
2.7.4


From 7cc02486415453a384f36baafa53d3dde3649489 Mon Sep 17 00:00:00 2001
From: Boram Bae <boram21.bae@samsung.com>
Date: Fri, 27 Mar 2020 11:49:50 +0900
Subject: [PATCH 03/16] [ACR-1531] Add new sensors feature key

 - tizen.org/feature/sensor.heart_rate_monitor.batch
 - tizen.org/feature/sensor.heart_rate_monitor.led_green.batch

Change-Id: I4f873341a7837fc03967614bbba0adb524750ed4
Signed-off-by: Boram Bae <boram21.bae@samsung.com>
---
 emulator/model-config.xml          | 2 ++
 emulator/model-config_mobile.xml   | 2 ++
 emulator/model-config_mobile64.xml | 2 ++
 emulator/model-config_tv.xml       | 2 ++
 emulator/model-config_tv64.xml     | 2 ++
 emulator/model-config_wearable.xml | 2 ++
 generic/model-config-iot.xml       | 2 ++
 generic/model-config.xml           | 2 ++
 rpi3/model-config.xml              | 2 ++
 rpi3/model-config_tv.xml           | 2 ++
 tm1/model-config.xml               | 2 ++
 tm2/model-config.xml               | 2 ++
 tw2/model-config.xml               | 2 ++
 tw3/model-config.xml               | 2 ++
 xu3/model-config.xml               | 2 ++
 xu3/model-config_ivi.xml           | 2 ++
 xu3/model-config_tv.xml            | 2 ++
 17 files changed, 34 insertions(+)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index afaf1d7..77d1833 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -183,6 +183,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">true</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index 1ca48a6..5fc540c 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -211,6 +211,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">true</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index d091857..fb51b1d 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -211,6 +211,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">true</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index 6a24b77..362e7b0 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -209,6 +209,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index f18d160..2f198b4 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -206,6 +206,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index c320dc0..787b6e9 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -215,6 +215,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index e86117a..b3239dd 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -238,6 +238,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">false</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index 6470c0d..e53097e 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -101,6 +101,8 @@
 		<key name="tizen.org/feature/sensor.photometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.proximity" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.proximity.wakeup" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">false</key>
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index a010e94..524db91 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -204,6 +204,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index 85bc41a..d9cf11b 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -197,6 +197,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index 196b3b4..c85b78d 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -212,6 +212,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">true</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index e012694..e050844 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -213,6 +213,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">true</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 086de49..755525b 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -215,6 +215,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 08ec1f1..8fc8826 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -215,6 +215,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">true</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">true</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index 561ca0b..c4878e6 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -206,6 +206,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index 5fbdc88..c93b165 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -193,6 +193,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index 44de35b..745f42c 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -208,6 +208,8 @@
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
-- 
2.7.4


From 60fa4819387b361054abd9ec6bcfd927891e5a99 Mon Sep 17 00:00:00 2001
From: wchang kim <wchang.kim@samsung.com>
Date: Mon, 6 Apr 2020 17:34:03 +0900
Subject: [PATCH 04/16] Sync it from model-config_tv of xu3

Change-Id: I7e44736f6357807c587a3ae2e14b068165586d1a
---
 rpi3/model-config_tv.xml | 63 ++++++++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index d9cf11b..4746adf 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -9,10 +9,14 @@
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
 		<key name="tizen.org/feature/accessibility.negative" type="bool">false</key>
-		<key name="tizen.org/feature/account.sync" type="bool">false</key>
+		<key name="tizen.org/feature/account" type="bool" capi="on" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/account.sync" type="bool">false</key>
 		<key name="tizen.org/feature/app_history" type="bool">false</key>
+		<key name="tizen.org/feature/archive" type="bool">true</key>
+		<key name="tizen.org/feature/attach_panel" type="bool">false</key>
+		<key name="tizen.org/feature/badge" type="bool">false</key>
 		<key name="tizen.org/feature/battery" type="bool">false</key>
+		<key name="tizen.org/feature/bookmark" type="bool">false</key>
 		<key name="tizen.org/feature/calendar" type="bool" capi="on" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/camera" type="bool">false</key>
 		<key name="tizen.org/feature/camera.back" type="bool">false</key>
@@ -20,14 +24,19 @@
 		<key name="tizen.org/feature/camera.front" type="bool">false</key>
 		<key name="tizen.org/feature/camera.front.flash" type="bool">false</key>
 		<key name="tizen.org/feature/consumer_ir" type="bool">false</key>
+		<key name="tizen.org/feature/contact" type="bool">false</key>
 		<key name="tizen.org/feature/container" type="bool">false</key>
 		<key name="tizen.org/feature/contextual_trigger" type="bool">false</key>
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
+		<key name="tizen.org/feature/datacontrol" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
+		<key name="tizen.org/feature/email" type="bool">false</key>
+		<key name="tizen.org/feature/exif" type="bool">true</key>
 		<key name="tizen.org/feature/feedback.vibration" type="bool">false</key>
+		<key name="tizen.org/feature/fido.uaf" type="bool">false</key>
 		<key name="tizen.org/feature/fmradio" type="bool">false</key>
 		<key name="tizen.org/feature/graphics.acceleration" type="bool">true</key>
 		<key name="tizen.org/feature/humanactivitymonitor" type="bool">false</key>
@@ -38,19 +47,18 @@
 		<key name="tizen.org/feature/led" type="bool">false</key>
 		<key name="tizen.org/feature/location" type="bool">false</key>
 		<key name="tizen.org/feature/location.batch" type="bool">false</key>
-		<key name="tizen.org/feature/location.fused" type="bool">false</key>
 		<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/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/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.audio_recording" type="bool">false</key>
 		<key name="tizen.org/feature/media.video_recording" type="bool">false</key>
-		<key name="tizen.org/feature/microphone" type="bool">true</key>
+		<key name="tizen.org/feature/microphone" type="bool">false</key>
 		<key name="tizen.org/feature/minicontrol" type="bool">false</key>
-		<key name="tizen.org/feature/multi_assistant" type="bool">true</key>
+		<key name="tizen.org/feature/multi_assistant" type="bool">false</key>
 		<key name="tizen.org/feature/multi_point_touch.pinch_zoom" type="bool">false</key>
 		<key name="tizen.org/feature/multi_point_touch.point_count" type="int">0</key>
 		<key name="tizen.org/feature/multimedia.transcoder" type="bool">false</key>
@@ -58,7 +66,7 @@
 		<key name="tizen.org/feature/multimedia.raw_video" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.stream_info" type="bool">true</key>
-		<key name="tizen.org/feature/multimedia.media_codec" type="bool">true</key>
+		<key name="tizen.org/feature/multimedia.media_codec" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.spherical_video" type="bool">false</key>
 		<key name="tizen.org/feature/multimedia.player.audio_offload" type="bool">false</key>
 		<key name="tizen.org/feature/content.scanning.others" type="bool">true</key>
@@ -73,7 +81,6 @@
 		<key name="tizen.org/feature/network.bluetooth.hid" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.hid_device" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.le" type="bool">false</key>
-		<key name="tizen.org/feature/network.bluetooth.le.ipsp" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.le.gatt.server" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.le.gatt.client" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.opp" type="bool">false</key>
@@ -88,7 +95,8 @@
 		<key name="tizen.org/feature/network.secure_element" type="bool">false</key>
 		<key name="tizen.org/feature/network.secure_element.ese" type="bool">false</key>
 		<key name="tizen.org/feature/network.secure_element.uicc" type="bool">false</key>
-		<key name="tizen.org/feature/storage.external" type="bool">true</key>
+		<key name="tizen.org/feature/network.service_discovery.dnssd" type="bool">true</key>
+		<key name="tizen.org/feature/network.service_discovery.ssdp" type="bool">true</key>
 		<key name="tizen.org/feature/network.telephony" type="bool">false</key>
 		<key name="tizen.org/feature/network.telephony.sms.cbs" type="bool">false</key>
 		<key name="tizen.org/feature/network.telephony.sms" type="bool">false</key>
@@ -102,20 +110,22 @@
 		<key name="tizen.org/feature/network.telephony.service.hsupa" type="bool">false</key>
 		<key name="tizen.org/feature/network.telephony.service.lte" type="bool">false</key>
 		<key name="tizen.org/feature/network.telephony.service.umts" type="bool">false</key>
-		<key name="tizen.org/feature/network.tethering" type="bool">true</key>
+		<key name="tizen.org/feature/network.tethering" type="bool">false</key>
 		<key name="tizen.org/feature/network.tethering.bluetooth" type="bool">false</key>
-		<key name="tizen.org/feature/network.tethering.usb" type="bool">true</key>
-		<key name="tizen.org/feature/network.tethering.wifi" type="bool">true</key>
+		<key name="tizen.org/feature/network.tethering.usb" type="bool">false</key>
+		<key name="tizen.org/feature/network.tethering.wifi" type="bool">false</key>
 		<key name="tizen.org/feature/network.vpn" type="bool">false</key>
 		<key name="tizen.org/feature/network.wifi" type="bool">true</key>
-		<key name="tizen.org/feature/network.wifi.direct" type="bool">true</key>
-		<key name="tizen.org/feature/network.wifi.direct.display" type="bool">true</key>
+		<key name="tizen.org/feature/network.wifi.direct" type="bool">false</key>
+		<key name="tizen.org/feature/network.wifi.direct.display" type="bool">false</key>
 		<key name="tizen.org/feature/network.wifi.direct.service_discovery" type="bool">false</key>
 		<key name="tizen.org/feature/network.wifi.softap" type="bool">true</key>
 		<key name="tizen.org/feature/network.wifi.tdls" type="bool">false</key>
 		<key name="tizen.org/feature/network.traffic_control" type="bool">true</key>
 		<key name="tizen.org/feature/network.inm" type="bool">true</key>
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
+		<key name="tizen.org/feature/notification" type="bool">false</key>
+		<key name="tizen.org/feature/oauth2" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
@@ -125,10 +135,9 @@
 		<key name="tizen.org/feature/opengles.texture_format.utc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.version.1_1" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.version.2_0" type="bool">true</key>
-		<key name="tizen.org/feature/platform.core.cpu.arch" type="string">armv8</key>
+		<key name="tizen.org/feature/platform.core.cpu.arch" type="string">armv7</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.armv6" type="bool">false</key>
-		<key name="tizen.org/feature/platform.core.cpu.arch.armv7" type="bool">false</key>
-		<key name="tizen.org/feature/platform.core.cpu.arch.armv8" type="bool">true</key>
+		<key name="tizen.org/feature/platform.core.cpu.arch.armv7" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.x86" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.sse2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.sse3" type="bool">false</key>
@@ -163,7 +172,6 @@
 		<key name="tizen.org/feature/screen.shape.circle" type="bool">false</key>
 		<key name="tizen.org/feature/screen.shape.rectangle" type="bool">true</key>
 		<key name="tizen.org/feature/screen.width" type="int">1280</key>
-		<key name="tizen.org/feature/security.tee" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.accelerometer" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.accelerometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.activity_recognition" type="bool">false</key>
@@ -192,6 +200,9 @@
 		<key name="tizen.org/feature/sensor.proximity" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.proximity.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.rotation_vector" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.significant_motion" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.sleep_monitor" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.stress_monitor" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.temperature" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
@@ -202,10 +213,11 @@
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
 		<key name="tizen.org/feature/shortcut" type="bool">false</key>
 		<key name="tizen.org/feature/sip.voip" type="bool">false</key>
-		<key name="tizen.org/feature/speech.recognition" type="bool">false</key>
+		<key name="tizen.org/feature/speech.recognition" type="bool">true</key>
 		<key name="tizen.org/feature/speech.synthesis" type="bool">true</key>
 		<key name="tizen.org/feature/speech.control" type="bool">true</key>
 		<key name="tizen.org/feature/speech.control_manager" type="bool">true</key>
+		<key name="tizen.org/feature/storage.external" type="bool">true</key>
 		<key name="tizen.org/feature/systemsetting" type="bool">false</key>
 		<key name="tizen.org/feature/systemsetting.home_screen" type="bool">false</key>
 		<key name="tizen.org/feature/systemsetting.lock_screen" type="bool">false</key>
@@ -224,19 +236,20 @@
 		<key name="tizen.org/feature/tv.tuner" type="bool">false</key>
 		<key name="tizen.org/feature/tv.information" type="bool">false</key>
 		<key name="tizen.org/feature/usb.accessory" type="bool">false</key>
-		<key name="tizen.org/feature/usb.host" type="bool">true</key>
+		<key name="tizen.org/feature/usb.host" type="bool">false</key>
 		<key name="tizen.org/feature/vision.barcode_detection" type="bool">true</key>
 		<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">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.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>
 		<key name="tizen.org/feature/web.ime" type="bool">false</key>
 		<key name="tizen.org/feature/web.service" type="bool">false</key>
+		<key name="tizen.org/feature/websetting" type="bool">true</key>
 		<key name="tizen.org/system/sound.media.volume.resolution.max" type="int">15</key>
 		<key name="tizen.org/system/sound.notification.volume.resolution.max" type="int">15</key>
 		<key name="tizen.org/system/sound.ringtone.volume.resolution.max" type="int">15</key>
@@ -244,8 +257,6 @@
 		<key name="tizen.org/system/input.key.volume" type="bool">false</key>
 		<key name="tizen.org/system/input.key.menu" type="bool">false</key>
 		<key name="tizen.org/system/input.key.back" type="bool">false</key>
-		<key name="tizen.org/feature/fido.uaf" type="bool">true</key>
-		<key name="tizen.org/feature/oauth2" type="bool">false</key>
 		<key name="tizen.org/feature/security.privacy_privilege" type="bool">false</key>
 		<key name="tizen.org/feature/security.device_certificate" type="bool">false</key>
 		<key name="tizen.org/system/device_type" type="string">TV</key>
-- 
2.7.4


From 80e44388bde0d72019670594f916c826ab7b90a4 Mon Sep 17 00:00:00 2001
From: Dongchul Lim <dc7.lim@samsung.com>
Date: Tue, 21 Apr 2020 14:29:38 +0900
Subject: [PATCH 05/16] Tizen version change

Change-Id: Icc68411854806d5c4c380acce557c54f92264cd3
---
 emulator/model-config.xml           |  8 ++++----
 emulator/model-config_mobile.xml    |  8 ++++----
 emulator/model-config_mobile64.xml  |  8 ++++----
 emulator/model-config_tv.xml        |  8 ++++----
 emulator/model-config_tv64.xml      | 10 +++++-----
 emulator/model-config_wearable.xml  |  8 ++++----
 generic/model-config-iot.xml        | 10 +++++-----
 generic/model-config.xml            |  8 ++++----
 packaging/unified-model-config.spec |  2 +-
 rpi3/model-config.xml               |  8 ++++----
 rpi3/model-config_tv.xml            |  8 ++++----
 tm1/model-config.xml                |  8 ++++----
 tm2/model-config.xml                |  8 ++++----
 tw2/model-config.xml                |  8 ++++----
 tw3/model-config.xml                |  8 ++++----
 xu3/model-config.xml                |  8 ++++----
 xu3/model-config_ivi.xml            |  8 ++++----
 xu3/model-config_tv.xml             |  8 ++++----
 18 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index 77d1833..ca24839 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -121,9 +121,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index 5fc540c..b23a07a 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -146,9 +146,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index fb51b1d..1501d16 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -146,9 +146,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index 362e7b0..22f2277 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -144,9 +144,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index 2f198b4..63b1260 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<xml version="1.0" encoding="UTF-8" standalone="no"?>
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -141,9 +141,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index 787b6e9..62d43f0 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="EMULATOR">
+<model-config version="6.0" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">emulator</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -148,9 +148,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index b3239dd..d52e624 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="TizenIOT">
+<model-config version="6.0" model="TizenIOT">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TizenIOT</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">none</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -155,7 +155,7 @@
 		<key name="tizen.org/feature/peripheral_io.adc" type="bool">false</key>
 		<key name="tizen.org/feature/peripheral_io.spi" type="bool">true</key>
 		<key name="tizen.org/feature/peripheral_io.uart" type="bool">true</key>
-		<key name="tizen.org/feature/platform.core.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.core.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch" type="string">armv7</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.armv6" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.armv7" type="bool">true</key>
@@ -169,10 +169,10 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
 		<key name="tizen.org/feature/platform.version.name" type="string">TizenIOT</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen" type="bool">false</key>
 		<key name="tizen.org/feature/screen.always_on.high_color" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index e53097e..73c796e 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="2.2.0" model="generic">
+<model-config version="6.0" model="generic">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Generic</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">2.2.1</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">Generic</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">N/A</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
@@ -68,9 +68,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.ssse3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">3.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">2.2</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
 		<key name="tizen.org/feature/screen.coordinate_system.size.large" type="bool">true</key>
diff --git a/packaging/unified-model-config.spec b/packaging/unified-model-config.spec
index fa12a8f..8bd7df3 100755
--- a/packaging/unified-model-config.spec
+++ b/packaging/unified-model-config.spec
@@ -2,7 +2,7 @@
 
 Name:		unified-model-config
 Summary:	All Model configurations
-Version:	0.0.5
+Version:	6.0.0
 Release:	0
 Group:		System/Configuration
 BuildArch:	noarch
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index 524db91..fa1b7e3 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="rpi3">
+<model-config version="6.0" model="rpi3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">rpi3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">BCM2837</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -140,9 +140,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index 4746adf..e87e14c 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="rpi3">
+<model-config version="6.0" model="rpi3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">rpi3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">BCM2837</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -145,9 +145,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index c85b78d..267e0bb 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="tm1">
+<model-config version="6.0" model="tm1">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TM1</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">SC7727S</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">SC7727S</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -148,9 +148,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index e050844..5aa3464 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="tm2">
+<model-config version="6.0" model="tm2">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TM2</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos5433</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">XMM6260</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 755525b..8d726c0 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="tw2">
+<model-config version="6.0" model="tw2">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TW2</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos7270</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">4G LTE</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">true</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.shape.circle" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 8fc8826..ad1ec8d 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="tw3">
+<model-config version="6.0" model="tw3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TW3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos7270</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">4G LTE</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">true</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.shape.circle" type="bool">true</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index c4878e6..a316b72 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="xu3">
+<model-config version="6.0" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -143,9 +143,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index c93b165..c00219b 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="xu3">
+<model-config version="6.0" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -130,9 +130,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">ivi</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index 745f42c..a48af17 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="5.5" model="xu3">
+<model-config version="6.0" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -145,9 +145,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">5.5</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
-- 
2.7.4


From 87d0aaf261d7e4d4e73fbf42053f7ebcf7d4f48c Mon Sep 17 00:00:00 2001
From: Abhishek Vijay <abhishek.v@samsung.com>
Date: Mon, 27 Apr 2020 16:06:51 +0530
Subject: [PATCH 06/16] [Non-ACR] Enable account feature - rpi3, xu3 & tv

Change-Id: I267cdc92b2898ef5b4daec7cd902adb814da5b11
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>
---
 rpi3/model-config.xml    | 2 +-
 rpi3/model-config_tv.xml | 2 +-
 xu3/model-config.xml     | 2 +-
 xu3/model-config_tv.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index fa1b7e3..61ecb00 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -9,7 +9,7 @@
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
 		<key name="tizen.org/feature/accessibility.negative" type="bool">false</key>
-		<key name="tizen.org/feature/account" type="bool">false</key>
+		<key name="tizen.org/feature/account" type="bool">true</key>
 		<key name="tizen.org/feature/account.sync" type="bool">false</key>
 		<key name="tizen.org/feature/app_history" type="bool">false</key>
 		<key name="tizen.org/feature/battery" type="bool">false</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index e87e14c..e57c018 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -9,7 +9,7 @@
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
 		<key name="tizen.org/feature/accessibility.negative" type="bool">false</key>
-		<key name="tizen.org/feature/account" type="bool" capi="on" webapi="off" csapi="on">true</key>
+		<key name="tizen.org/feature/account" type="bool">true</key>
 		<key name="tizen.org/feature/account.sync" type="bool">false</key>
 		<key name="tizen.org/feature/app_history" type="bool">false</key>
 		<key name="tizen.org/feature/archive" type="bool">true</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index a316b72..04ace25 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -9,7 +9,7 @@
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
 		<key name="tizen.org/feature/accessibility.negative" type="bool">false</key>
-		<key name="tizen.org/feature/account" type="bool">false</key>
+		<key name="tizen.org/feature/account" type="bool">true</key>
 		<key name="tizen.org/feature/account.sync" type="bool">false</key>
 		<key name="tizen.org/feature/app_history" type="bool">false</key>
 		<key name="tizen.org/feature/archive" type="bool">true</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index a48af17..e7e177d 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -9,7 +9,7 @@
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
 		<key name="tizen.org/feature/accessibility.negative" type="bool">false</key>
-		<key name="tizen.org/feature/account" type="bool" capi="on" webapi="off" csapi="on">true</key>
+		<key name="tizen.org/feature/account" type="bool">true</key>
 		<key name="tizen.org/feature/account.sync" type="bool">false</key>
 		<key name="tizen.org/feature/app_history" type="bool">false</key>
 		<key name="tizen.org/feature/archive" type="bool">true</key>
-- 
2.7.4


From 1be444cb05147583a06b2e2a429c5731f1b60735 Mon Sep 17 00:00:00 2001
From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Tue, 28 Apr 2020 15:38:39 +0900
Subject: [PATCH 07/16] [Non-ACR] Enable BT features on rpi3 TV profile

Change-Id: I447f60975f39e7fada3f67626367a0d1125aeccd
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---
 rpi3/model-config_tv.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index e57c018..e9dabdb 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -73,16 +73,17 @@
 		<key name="tizen.org/feature/content.filter.pinyin" type="bool">true</key>
 		<key name="tizen.org/feature/network.internet" type="bool">true</key>
 		<key name="tizen.org/feature/network.ethernet" type="bool">true</key>
-		<key name="tizen.org/feature/network.bluetooth" type="bool">false</key>
+		<key name="tizen.org/feature/network.bluetooth" type="bool">true</key>
 		<key name="tizen.org/feature/network.bluetooth.audio.call" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.audio.media" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.audio.controller" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.health" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.hid" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.hid_device" type="bool">false</key>
-		<key name="tizen.org/feature/network.bluetooth.le" type="bool">false</key>
-		<key name="tizen.org/feature/network.bluetooth.le.gatt.server" type="bool">false</key>
-		<key name="tizen.org/feature/network.bluetooth.le.gatt.client" type="bool">false</key>
+		<key name="tizen.org/feature/network.bluetooth.le" type="bool">true</key>
+		<key name="tizen.org/feature/network.bluetooth.le.ipsp" type="bool">false</key>
+		<key name="tizen.org/feature/network.bluetooth.le.gatt.server" type="bool">true</key>
+		<key name="tizen.org/feature/network.bluetooth.le.gatt.client" type="bool">true</key>
 		<key name="tizen.org/feature/network.bluetooth.opp" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.oob" type="bool">false</key>
 		<key name="tizen.org/feature/network.bluetooth.phonebook.client" type="bool">false</key>
-- 
2.7.4


From 5872d6425c74d53acab71e68edd2f24a7711d1ee Mon Sep 17 00:00:00 2001
From: Sunghyun Kim <scholb.kim@samsung.com>
Date: Thu, 28 May 2020 15:55:55 +0900
Subject: [PATCH 08/16] [TCSACR-298] Add new feature key to
 opengles.surfaceless_context

 - tizen.org/feature/opengles.surfaceless_context

Change-Id: I36129de46eca3aacecfba5a2258a4d44511cae9c
---
 emulator/model-config.xml          | 1 +
 emulator/model-config_mobile.xml   | 1 +
 emulator/model-config_mobile64.xml | 1 +
 emulator/model-config_tv.xml       | 1 +
 emulator/model-config_tv64.xml     | 1 +
 emulator/model-config_wearable.xml | 1 +
 generic/model-config-iot.xml       | 1 +
 generic/model-config.xml           | 1 +
 rpi3/model-config.xml              | 1 +
 rpi3/model-config_tv.xml           | 1 +
 tm1/model-config.xml               | 1 +
 tm2/model-config.xml               | 1 +
 tw2/model-config.xml               | 1 +
 tw3/model-config.xml               | 1 +
 xu3/model-config.xml               | 1 +
 xu3/model-config_ivi.xml           | 1 +
 xu3/model-config_tv.xml            | 1 +
 17 files changed, 17 insertions(+)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index ca24839..4a67735 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -103,6 +103,7 @@
 		<key name="tizen.org/feature/network.inm" type="bool">false</key>
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index b23a07a..26179d2 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -128,6 +128,7 @@
 		<key name="tizen.org/feature/nlp" type="bool" capi="off" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index 1501d16..311674b 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -128,6 +128,7 @@
 		<key name="tizen.org/feature/nlp" type="bool" capi="off" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index 22f2277..09dd15c 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -126,6 +126,7 @@
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/oauth2" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index 63b1260..6cde874 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -123,6 +123,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index 62d43f0..b8477d8 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -130,6 +130,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index d52e624..39bf40c 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -138,6 +138,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">true</key>
 		<key name="tizen.org/feature/notification" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">false</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index 73c796e..9bee54b 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -52,6 +52,7 @@
 		<key name="tizen.org/feature/network.wifi.direct" type="bool">false</key>
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index 61ecb00..b72f037 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -116,6 +116,7 @@
 		<key name="tizen.org/feature/network.inm" type="bool">true</key>
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index e9dabdb..9090524 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -128,6 +128,7 @@
 		<key name="tizen.org/feature/notification" type="bool">false</key>
 		<key name="tizen.org/feature/oauth2" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index 267e0bb..ace0b64 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -130,6 +130,7 @@
 		<key name="tizen.org/feature/nlp" type="bool" capi="off" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index 5aa3464..7dbbe6f 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -131,6 +131,7 @@
 		<key name="tizen.org/feature/nlp" type="bool" capi="off" webapi="off" csapi="on">true</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 8d726c0..4660a0f 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -131,6 +131,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index ad1ec8d..33ed6b9 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -131,6 +131,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/notification" type="bool">true</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">true</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index 04ace25..10844f1 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -125,6 +125,7 @@
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/notification" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index c00219b..cf6ce27 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -112,6 +112,7 @@
 		<key name="tizen.org/feature/network.inm" type="bool">true</key>
 		<key name="tizen.org/feature/nlp" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index e7e177d..620c08e 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -127,6 +127,7 @@
 		<key name="tizen.org/feature/notification" type="bool">false</key>
 		<key name="tizen.org/feature/oauth2" type="bool">false</key>
 		<key name="tizen.org/feature/opengles" type="bool">true</key>
+		<key name="tizen.org/feature/opengles.surfaceless_context" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.3dc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.atc" type="bool">false</key>
 		<key name="tizen.org/feature/opengles.texture_format.etc" type="bool">true</key>
-- 
2.7.4


From 17bb318a9cfb4c8ec7241d1b5a2f395b1bbff073 Mon Sep 17 00:00:00 2001
From: Kichan Kwon <k_c.kwon@samsung.com>
Date: Fri, 5 Jun 2020 10:25:53 +0900
Subject: [PATCH 09/16] Disable auto rotation on Wearable emulator

Change-Id: I8bf7f116c0a4fb3bd3731808bf4ea47b01fcc0d4
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>
---
 emulator/model-config_wearable.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index b8477d8..6e428ef 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -153,7 +153,7 @@
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
 		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
-		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
+		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
 		<key name="tizen.org/feature/screen.coordinate_system.size.large" type="bool">false</key>
 		<key name="tizen.org/feature/screen.coordinate_system.size.normal" type="bool">true</key>
-- 
2.7.4


From 785a2b8197d272b42efa662c17d9d2c4a1110846 Mon Sep 17 00:00:00 2001
From: JinWang An <jinwang.an@samsung.com>
Date: Fri, 26 Jun 2020 20:45:19 +0900
Subject: [PATCH 10/16] Change from false to true about notification.email

Change-Id: I510902c3fb58e0403b433271f4046c00c9f4154e
Signed-off-by: JinWang An <jinwang.an@samsung.com>
---
 tw3/model-config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 33ed6b9..e375990 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -230,7 +230,7 @@
 		<key name="tizen.org/feature/systemsetting.home_screen" type="bool">true</key>
 		<key name="tizen.org/feature/systemsetting.lock_screen" type="bool">false</key>
 		<key name="tizen.org/feature/systemsetting.incoming_call" type="bool">true</key>
-		<key name="tizen.org/feature/systemsetting.notification_email" type="bool">false</key>
+		<key name="tizen.org/feature/systemsetting.notification_email" type="bool">true</key>
 		<key name="tizen.org/feature/systemsetting.font" type="bool">true</key>
 		<key name="tizen.org/feature/thermistor.ap" type="bool">true</key>
 		<key name="tizen.org/feature/thermistor.cp" type="bool">false</key>
-- 
2.7.4


From 67604a0bd27c4f9c98aa039c7fb3b2463858052b Mon Sep 17 00:00:00 2001
From: JinWang An <jinwang.an@samsung.com>
Date: Sat, 8 Aug 2020 02:16:49 +0900
Subject: [PATCH 11/16] Set true about notification.email for wearable emulator

Change-Id: Ibad57eeb1f3db3c7a6589d4ee058fcc771891f59
Signed-off-by: JinWang An <jinwang.an@samsung.com>
---
 emulator/model-config_wearable.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index 6e428ef..f20d865 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -230,7 +230,7 @@
 		<key name="tizen.org/feature/systemsetting.home_screen" type="bool">true</key>
 		<key name="tizen.org/feature/systemsetting.lock_screen" type="bool">false</key>
 		<key name="tizen.org/feature/systemsetting.incoming_call" type="bool">true</key>
-		<key name="tizen.org/feature/systemsetting.notification_email" type="bool">false</key>
+		<key name="tizen.org/feature/systemsetting.notification_email" type="bool">true</key>
 		<key name="tizen.org/feature/systemsetting.font" type="bool">true</key>
 		<key name="tizen.org/feature/thermistor.ap" type="bool">false</key>
 		<key name="tizen.org/feature/thermistor.cp" type="bool">false</key>
-- 
2.7.4


From 05851dd31727ce88112f2370beb1d4ffe21127c4 Mon Sep 17 00:00:00 2001
From: Sungwook Park <sungwook79.park@samsung.com>
Date: Wed, 12 Aug 2020 16:55:43 +0900
Subject: [PATCH 12/16] Change gesture feature key to enable

Change-Id: I5bff65e2f326ee14f3399cda597598ee91e9b517
Signed-off-by: Sungwook Park <sungwook79.park@samsung.com>
---
 tw2/model-config.xml | 4 ++--
 tw3/model-config.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 4660a0f..684bbf7 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -187,7 +187,7 @@
 		<key name="tizen.org/feature/sensor.barometer" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.barometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.geomagnetic_rotation_vector" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gravity" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope.uncalibrated" type="bool">false</key>
@@ -215,7 +215,7 @@
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.wrist_up" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index e375990..2743f54 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -187,7 +187,7 @@
 		<key name="tizen.org/feature/sensor.barometer" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.barometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.geomagnetic_rotation_vector" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gravity" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope.uncalibrated" type="bool">false</key>
@@ -215,7 +215,7 @@
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
+		<key name="tizen.org/feature/sensor.wrist_up" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">true</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
-- 
2.7.4


From c6b2f647bc44c95775f0b3902a78ebf957307606 Mon Sep 17 00:00:00 2001
From: "jijoong.moon" <jijoong.moon@samsung.com>
Date: Wed, 12 Aug 2020 21:00:50 +0900
Subject: [PATCH 13/16] [ACR-1579]  Newly add machine_learning.training feature

This patch newly adds machine_learning.training features.
Mobile, TV, Wearable and IoT Headed are supported.

Change-Id: I9e13caabf46060992fb8ecd21daed92b6eb3a78d
Signed-off-by: jijoong.moon <jijoong.moon@samsung.com>
---
 emulator/model-config.xml          | 1 +
 emulator/model-config_mobile.xml   | 1 +
 emulator/model-config_mobile64.xml | 1 +
 emulator/model-config_tv.xml       | 1 +
 emulator/model-config_tv64.xml     | 1 +
 emulator/model-config_wearable.xml | 1 +
 generic/model-config-iot.xml       | 1 +
 generic/model-config.xml           | 1 +
 rpi3/model-config.xml              | 1 +
 rpi3/model-config_tv.xml           | 1 +
 tm1/model-config.xml               | 1 +
 tm2/model-config.xml               | 1 +
 tw2/model-config.xml               | 1 +
 tw3/model-config.xml               | 1 +
 xu3/model-config.xml               | 1 +
 xu3/model-config_ivi.xml           | 1 +
 xu3/model-config_tv.xml            | 1 +
 17 files changed, 17 insertions(+)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index 4a67735..10bd45d 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -33,6 +33,7 @@
 		<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/machine_learning.training" 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 26179d2..d801206 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 311674b..4d78771 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 09dd15c..a85f16c 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -53,6 +53,7 @@
 		<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/machine_learning.training" 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 6cde874..58dc790 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -51,6 +51,7 @@
 		<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/machine_learning.training" 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 f20d865..adbcf68 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -53,6 +53,7 @@
 		<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/machine_learning.training" 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 39bf40c..a3ee993 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -56,6 +56,7 @@
 		<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/machine_learning.training" 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 9bee54b..acbfe78 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -25,6 +25,7 @@
 		<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/machine_learning.training" type="bool">false</key>
 		<key name="tizen.org/feature/microphone" type="bool">true</key>
 		<key name="tizen.org/feature/multimedia.stream_recorder" type="bool">false</key>
 		<key name="tizen.org/feature/multi_assistant" type="bool">true</key>
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index b72f037..253ca32 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -45,6 +45,7 @@
 		<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/machine_learning.training" 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 9090524..507dc14 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -53,6 +53,7 @@
 		<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/machine_learning.training" 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/tm1/model-config.xml b/tm1/model-config.xml
index ace0b64..c362780 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 7dbbe6f..d8a9815 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 4660a0f..5f2ab8d 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 e375990..f621f5e 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -52,6 +52,7 @@
 		<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/machine_learning.training" 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 10844f1..083164a 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -51,6 +51,7 @@
 		<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/machine_learning.training" 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 cf6ce27..73f1f6d 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -43,6 +43,7 @@
 		<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/machine_learning.training" 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 620c08e..cbe3cf3 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -53,6 +53,7 @@
 		<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/machine_learning.training" 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>
-- 
2.7.4


From 340dd4c65571aabfad81134c4e7ea5f3035286e8 Mon Sep 17 00:00:00 2001
From: Konrad Kuchciak <k.kuchciak@samsung.com>
Date: Tue, 1 Sep 2020 09:13:21 +0200
Subject: [PATCH 14/16] Add new diagnostics feature key

 - tizen.org/feature/diagnostics

Change-Id: I66159518dc30aefa3b0284c9963630bb5826f6be
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>
---
 emulator/model-config.xml          | 1 +
 emulator/model-config_mobile.xml   | 1 +
 emulator/model-config_mobile64.xml | 1 +
 emulator/model-config_tv.xml       | 1 +
 emulator/model-config_tv64.xml     | 1 +
 emulator/model-config_wearable.xml | 1 +
 generic/model-config-iot.xml       | 1 +
 generic/model-config.xml           | 1 +
 rpi3/model-config.xml              | 1 +
 rpi3/model-config_tv.xml           | 1 +
 tm1/model-config.xml               | 1 +
 tm2/model-config.xml               | 1 +
 tw2/model-config.xml               | 1 +
 tw3/model-config.xml               | 1 +
 xu3/model-config.xml               | 1 +
 xu3/model-config_ivi.xml           | 1 +
 xu3/model-config_tv.xml            | 1 +
 17 files changed, 17 insertions(+)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index 4a67735..a74334c 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -16,6 +16,7 @@
 		<key name="tizen.org/feature/camera.front.flash" type="bool">false</key>
 		<key name="tizen.org/feature/consumer_ir" type="bool">false</key>
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/feedback.vibration" type="bool">false</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index 26179d2..0a443aa 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index 311674b..57ae8de 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index 09dd15c..b029c02 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index 6cde874..7fae1ab 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -28,6 +28,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index f20d865..932a81b 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">true</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index 39bf40c..2040c27 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -31,6 +31,7 @@
 		<key name="tizen.org/feature/datacontrol" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
 		<key name="tizen.org/feature/device_update" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">false</key>
 		<key name="tizen.org/feature/display.state" type="bool">false</key>
 		<key name="tizen.org/feature/download" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index 9bee54b..defc5dd 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -14,6 +14,7 @@
 		<key name="tizen.org/feature/camera.front" type="bool">false</key>
 		<key name="tizen.org/feature/camera.front.flash" type="bool">false</key>
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/fmradio" type="bool">false</key>
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index b72f037..4ca6ee1 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -24,6 +24,7 @@
 		<key name="tizen.org/feature/contextual_trigger" type="bool">false</key>
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index 9090524..3b946d8 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -30,6 +30,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index ace0b64..bbedac2 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index 7dbbe6f..7bf31f0 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 684bbf7..c2f566f 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 2743f54..046266b 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -29,6 +29,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">true</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index 10844f1..318ebef 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -30,6 +30,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index cf6ce27..c733d38 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -24,6 +24,7 @@
 		<key name="tizen.org/feature/contextual_trigger" type="bool">false</key>
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index 620c08e..416f6a1 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -30,6 +30,7 @@
 		<key name="tizen.org/feature/database.encryption" type="bool">false</key>
 		<key name="tizen.org/feature/datacontrol" type="bool">false</key>
 		<key name="tizen.org/feature/datasync" type="bool">false</key>
+		<key name="tizen.org/feature/diagnostics" type="bool">true</key>
 		<key name="tizen.org/feature/display" type="bool">true</key>
 		<key name="tizen.org/feature/display.state" type="bool">true</key>
 		<key name="tizen.org/feature/download" type="bool">true</key>
-- 
2.7.4


From 8240f588805856642baee78c18ab8fc606441c3c Mon Sep 17 00:00:00 2001
From: sungwook park <sungwook79.park@samsung.com>
Date: Thu, 10 Sep 2020 05:00:54 +0000
Subject: [PATCH 15/16] Revert "Change gesture feature key to enable"

This reverts commit 05851dd31727ce88112f2370beb1d4ffe21127c4.

Change-Id: I1572c907b6b1d33786517a8d73b5768e9f4e829c
---
 tw2/model-config.xml | 4 ++--
 tw3/model-config.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 684bbf7..4660a0f 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -187,7 +187,7 @@
 		<key name="tizen.org/feature/sensor.barometer" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.barometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.geomagnetic_rotation_vector" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">true</key>
+		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.gravity" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope.uncalibrated" type="bool">false</key>
@@ -215,7 +215,7 @@
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.wrist_up" type="bool">true</key>
+		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">false</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 2743f54..e375990 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -187,7 +187,7 @@
 		<key name="tizen.org/feature/sensor.barometer" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.barometer.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.geomagnetic_rotation_vector" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">true</key>
+		<key name="tizen.org/feature/sensor.gesture_recognition" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.gravity" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.gyroscope.uncalibrated" type="bool">false</key>
@@ -215,7 +215,7 @@
 		<key name="tizen.org/feature/sensor.tiltmeter" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.tiltmeter.wakeup" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.ultraviolet" type="bool">false</key>
-		<key name="tizen.org/feature/sensor.wrist_up" type="bool">true</key>
+		<key name="tizen.org/feature/sensor.wrist_up" type="bool">false</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.batch" type="bool">true</key>
 		<key name="tizen.org/feature/sensor.heart_rate_monitor.led_green.batch" type="bool">true</key>
 		<key name="tizen.org/feature/shell.appwidget" type="bool">true</key>
-- 
2.7.4


From c0aa5f8d1e87f19ed27596d62919e34f5f3e6f07 Mon Sep 17 00:00:00 2001
From: wchang kim <wchang.kim@samsung.com>
Date: Tue, 10 Nov 2020 15:58:18 +0900
Subject: [PATCH 16/16] Change version string to 6.5

Change-Id: I05e2e505cc9bcbb28eda24aef5b32593f1445aa7
---
 emulator/model-config.xml           |  8 ++++----
 emulator/model-config_mobile.xml    |  8 ++++----
 emulator/model-config_mobile64.xml  |  8 ++++----
 emulator/model-config_tv.xml        |  8 ++++----
 emulator/model-config_tv64.xml      |  8 ++++----
 emulator/model-config_wearable.xml  |  8 ++++----
 generic/model-config-iot.xml        | 10 +++++-----
 generic/model-config.xml            |  8 ++++----
 packaging/unified-model-config.spec |  2 +-
 rpi3/model-config.xml               |  8 ++++----
 rpi3/model-config_tv.xml            |  8 ++++----
 tm1/model-config.xml                |  8 ++++----
 tm2/model-config.xml                |  8 ++++----
 tw2/model-config.xml                |  8 ++++----
 tw3/model-config.xml                |  8 ++++----
 xu3/model-config.xml                |  8 ++++----
 xu3/model-config_ivi.xml            |  8 ++++----
 xu3/model-config_tv.xml             |  8 ++++----
 18 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/emulator/model-config.xml b/emulator/model-config.xml
index c6ff75b..56c82e6 100644
--- a/emulator/model-config.xml
+++ b/emulator/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -124,9 +124,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_mobile.xml b/emulator/model-config_mobile.xml
index 8da1a81..29dd0de 100644
--- a/emulator/model-config_mobile.xml
+++ b/emulator/model-config_mobile.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_mobile64.xml b/emulator/model-config_mobile64.xml
index ab29317..d0ee394 100644
--- a/emulator/model-config_mobile64.xml
+++ b/emulator/model-config_mobile64.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_tv.xml b/emulator/model-config_tv.xml
index 6e82fe1..e95a199 100644
--- a/emulator/model-config_tv.xml
+++ b/emulator/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -147,9 +147,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_tv64.xml b/emulator/model-config_tv64.xml
index f4c9924..effcee6 100644
--- a/emulator/model-config_tv64.xml
+++ b/emulator/model-config_tv64.xml
@@ -1,9 +1,9 @@
 <xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -144,9 +144,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/emulator/model-config_wearable.xml b/emulator/model-config_wearable.xml
index 9ee029a..bfee3ef 100644
--- a/emulator/model-config_wearable.xml
+++ b/emulator/model-config_wearable.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="EMULATOR">
+<model-config version="6.5" model="EMULATOR">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Emulator</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">emulator</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">emulator</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -151,9 +151,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/generic/model-config-iot.xml b/generic/model-config-iot.xml
index dc702e3..ca7d233 100644
--- a/generic/model-config-iot.xml
+++ b/generic/model-config-iot.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="TizenIOT">
+<model-config version="6.5" model="TizenIOT">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TizenIOT</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">none</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -158,7 +158,7 @@
 		<key name="tizen.org/feature/peripheral_io.adc" type="bool">false</key>
 		<key name="tizen.org/feature/peripheral_io.spi" type="bool">true</key>
 		<key name="tizen.org/feature/peripheral_io.uart" type="bool">true</key>
-		<key name="tizen.org/feature/platform.core.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.core.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch" type="string">armv7</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.armv6" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.cpu.arch.armv7" type="bool">true</key>
@@ -172,10 +172,10 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
 		<key name="tizen.org/feature/platform.version.name" type="string">TizenIOT</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen" type="bool">false</key>
 		<key name="tizen.org/feature/screen.always_on.high_color" type="bool">false</key>
diff --git a/generic/model-config.xml b/generic/model-config.xml
index 989c9fa..e16119f 100644
--- a/generic/model-config.xml
+++ b/generic/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="generic">
+<model-config version="6.5" model="generic">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">Generic</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">Generic</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">N/A</key>
 		<key name="tizen.org/feature/accessibility.grayscale" type="bool">false</key>
@@ -71,9 +71,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.ssse3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
 		<key name="tizen.org/feature/screen.coordinate_system.size.large" type="bool">true</key>
diff --git a/packaging/unified-model-config.spec b/packaging/unified-model-config.spec
index 8bd7df3..4c2d908 100755
--- a/packaging/unified-model-config.spec
+++ b/packaging/unified-model-config.spec
@@ -2,7 +2,7 @@
 
 Name:		unified-model-config
 Summary:	All Model configurations
-Version:	6.0.0
+Version:	6.5.0
 Release:	0
 Group:		System/Configuration
 BuildArch:	noarch
diff --git a/rpi3/model-config.xml b/rpi3/model-config.xml
index 745da34..189f2ec 100644
--- a/rpi3/model-config.xml
+++ b/rpi3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="rpi3">
+<model-config version="6.5" model="rpi3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">rpi3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">BCM2837</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -143,9 +143,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/rpi3/model-config_tv.xml b/rpi3/model-config_tv.xml
index 46545c4..15183a9 100644
--- a/rpi3/model-config_tv.xml
+++ b/rpi3/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="rpi3">
+<model-config version="6.5" model="rpi3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">rpi3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">BCM2837</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -149,9 +149,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/tm1/model-config.xml b/tm1/model-config.xml
index 060ff2c..48d3013 100644
--- a/tm1/model-config.xml
+++ b/tm1/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="tm1">
+<model-config version="6.5" model="tm1">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TM1</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">SC7727S</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">SC7727S</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -151,9 +151,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
diff --git a/tm2/model-config.xml b/tm2/model-config.xml
index 12211b4..6dfe5d8 100644
--- a/tm2/model-config.xml
+++ b/tm2/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="tm2">
+<model-config version="6.5" model="tm2">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TM2</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos5433</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">XMM6260</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -152,9 +152,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">mobile</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
diff --git a/tw2/model-config.xml b/tw2/model-config.xml
index 1da5e89..026a7ba 100644
--- a/tw2/model-config.xml
+++ b/tw2/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="tw2">
+<model-config version="6.5" model="tw2">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TW2</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos7270</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">4G LTE</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -152,9 +152,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">true</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.shape.circle" type="bool">true</key>
diff --git a/tw3/model-config.xml b/tw3/model-config.xml
index 20eeb32..bcede6c 100644
--- a/tw3/model-config.xml
+++ b/tw3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="tw3">
+<model-config version="6.5" model="tw3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">TW3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos7270</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">4G LTE</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -152,9 +152,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">true</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">wearable</key>
 		<key name="tizen.org/feature/screen" type="bool">true</key>
 		<key name="tizen.org/feature/screen.shape.circle" type="bool">true</key>
diff --git a/xu3/model-config.xml b/xu3/model-config.xml
index 0c5b114..0e7766c 100644
--- a/xu3/model-config.xml
+++ b/xu3/model-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="xu3">
+<model-config version="6.5" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -146,9 +146,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">common</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/xu3/model-config_ivi.xml b/xu3/model-config_ivi.xml
index c00cf0a..9365e53 100644
--- a/xu3/model-config_ivi.xml
+++ b/xu3/model-config_ivi.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="xu3">
+<model-config version="6.5" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -133,9 +133,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">ivi</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">true</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
diff --git a/xu3/model-config_tv.xml b/xu3/model-config_tv.xml
index fc6f0f2..19ff955 100644
--- a/xu3/model-config_tv.xml
+++ b/xu3/model-config_tv.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<model-config version="6.0" model="xu3">
+<model-config version="6.5" model="xu3">
 	<platform>
 		<key name="tizen.org/system/model_name" type="string">xu3</key>
 		<key name="tizen.org/system/platform.name" type="string">Tizen</key>
-		<key name="tizen.org/feature/platform.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.version" type="string">6.5</key>
 		<key name="tizen.org/system/platform.processor" type="string">exynos4412</key>
 		<key name="tizen.org/system/platform.communication_processor" type="string">none</key>
 		<key name="tizen.org/system/manufacturer" type="string">Tizen</key>
@@ -148,9 +148,9 @@
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv2" type="bool">false</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv3" type="bool">true</key>
 		<key name="tizen.org/feature/platform.core.fpu.arch.vfpv4" type="bool">false</key>
-		<key name="tizen.org/feature/platform.native.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.native.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/platform.native.osp_compatible" type="bool">false</key>
-		<key name="tizen.org/feature/platform.web.api.version" type="string">6.0</key>
+		<key name="tizen.org/feature/platform.web.api.version" type="string">6.5</key>
 		<key name="tizen.org/feature/profile" type="string">tv</key>
 		<key name="tizen.org/feature/screen.auto_rotation" type="bool">false</key>
 		<key name="tizen.org/feature/screen.bpp" type="int">32</key>
-- 
2.7.4