Merge "Test patch to resolve crash" into tizensubmit/tizen/20200707.124014

8 files changed, 45 insertions, 19 deletions

diff --git a/src/settings/modules/bluetooth.c b/src/settings/modules/bluetooth.c
index 81e18b9..14912af 100755
--- a/src/settings/modules/bluetooth.c
+++ b/src/settings/modules/bluetooth.c
@@ -76,9 +76,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
 	Evas_Object *image = NULL;
 	const char *icon_path = NULL;
-
+	ERR("AMRIT bluetooth _view_update Before");
 	quickpanel_setting_icon_state_set(view, state);
-
+	ERR("AMRIT bluetooth _view_update After");
 	if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
 		icon_path = BUTTON_ICON_HIGHLIGHT;
diff --git a/src/settings/modules/dnd.c b/src/settings/modules/dnd.c
index 6fe1757..489dab2 100755
--- a/src/settings/modules/dnd.c
+++ b/src/settings/modules/dnd.c
@@ -133,9 +133,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
 	Evas_Object *image = NULL;
 	const char *icon_path = NULL;
-
+	ERR("AMRIT dnd _view_update Before");
 	quickpanel_setting_icon_state_set(view, state);
-
+	ERR("AMRIT dnd _view_update After");
 	if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
 		icon_path = BUTTON_ICON_HIGHLIGHT;
diff --git a/src/settings/modules/more-settings.c b/src/settings/modules/more-settings.c
index f912ad0..ba010b5 100755
--- a/src/settings/modules/more-settings.c
+++ b/src/settings/modules/more-settings.c
@@ -71,9 +71,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
 	Evas_Object *image = NULL;
 	const char *icon_path = NULL;
-
+	ERR("AMRIT more-setting softkey _view_update Before");
 	quickpanel_setting_icon_state_set(view, state);
-
+	ERR("AMRIT more-setting _view_update After");
 	if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
 		icon_path = BUTTON_ICON_HIGHLIGHT;
diff --git a/src/settings/modules/softkey.c b/src/settings/modules/softkey.c
index 6c0edc7..3a862cb 100755
--- a/src/settings/modules/softkey.c
+++ b/src/settings/modules/softkey.c
@@ -31,16 +31,19 @@
 #define BUTTON_ICON_NORMAL "icon_softkey_off.png"

 #define BUTTON_ICON_HIGHLIGHT "icon_softkey_on.png"

 #define BUTTON_ICON_DIM "icon_softkey_disabled.png"

+//#define VCONFKEY_SETAPPL_SOFT_KEY  "db/setting/soft_key"

 

 static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source);

 

 static const char *_label_get(void)

 {

+	ERR("AMRIT inside softkey _label_get Before leaving");

 	return BUTTON_LABEL;

 }

 

 static const char *_icon_get(qp_setting_icon_image_type type)

 {

+	ERR("AMRIT inside softkey _icon_get");

 	if (type == QP_SETTING_ICON_NORMAL) {

 		return BUTTON_ICON_NORMAL;

 	} else if (type == QP_SETTING_ICON_HIGHLIGHT) {

@@ -50,18 +53,20 @@ static const char *_icon_get(qp_setting_icon_image_type type)
 		return BUTTON_ICON_DIM;

 #endif

 	}

-

+	ERR("AMRIT inside softkey _icon_get Before leaving");

 	return NULL;

 }

 

 static void _long_press_cb(void *data)

 {

+	ERR("AMRIT inside softkey _long_press_cb");

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 

 	if (quickpanel_setting_module_is_immediate_actionable(module, QP_SETTING_ICON_LONGPRESSED) == false)

 		return;

 

 	quickpanel_setting_icon_handler_longpress(module->setting_pkgname, NULL, NULL);

+	ERR("AMRIT inside softkey _long_press_cb Before leaving");

 }

 

 static void _view_update(Evas_Object *view, int state, int flag_extra_1, int flag_extra_2)

@@ -70,8 +75,10 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 	Evas_Object *image = NULL;

 	const char *icon_path = NULL;

 

+	ERR("AMRIT inside softkey _view_update Before");

 	quickpanel_setting_icon_state_set(view, state);

-

+	ERR("AMRIT inside softkey _view_update After");

+	

 	if (state == ICON_VIEW_STATE_ON) {

 #ifdef BUTTON_ICON_HIGHLIGHT

 		icon_path = BUTTON_ICON_HIGHLIGHT;

@@ -90,6 +97,7 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 	image = quickpanel_setting_icon_image_new(view, icon_path);

 	quickpanel_setting_icon_content_set(view, image);

 	quickpanel_setting_icon_text_set(view, BUTTON_LABEL, state);

+	ERR("AMRIT inside softkey _view_update Before leaving");

 }

 

 static void _status_update(QP_Module_Setting *module, int flag_extra_1, int flag_extra_2)

@@ -113,6 +121,7 @@ static void _status_update(QP_Module_Setting *module, int flag_extra_1, int flag
 	quickpanel_setting_module_icon_view_update(module,

 			quickpanel_setting_module_icon_state_get(module),

 			FLAG_VALUE_VOID);

+	ERR("AMRIT inside softkey _status_update Before leaving");

 }

 

 static void _state_change(QP_Module_Setting *module)

@@ -138,17 +147,20 @@ static void _mouse_clicked_cb(void *data, Evas_Object *obj, const char *emission
 	DBG(">>> calling state_change <<<");

 	_state_change(module);

 	_status_update(data, FLAG_VALUE_VOID, FLAG_VALUE_VOID);

+	ERR("AMRIT inside softkey _mouse_clicked_cb Before leaving");

 }

 

 static int _register_module_event_handler(void *data)

 {

 	int ret = 0;

+	ERR("AMRIT inside softkey _register_module_event_handler Before leaving");

 	return QP_OK;

 }

 

 static int _unregister_module_event_handler(void *data)

 {

 	int ret = 0;

+	ERR("AMRIT inside softkey _unregister_module_event_handler Before leaving");

 	return QP_OK;

 }

 

@@ -160,18 +172,18 @@ static int _unregister_module_event_handler(void *data)
 static int _init(void *data)

 {

 	int ret = QP_OK;

-

+	ERR("AMRIT inside softkey _init");

 	ret = _register_module_event_handler(data);

-

+	ERR("AMRIT inside softkey _init Before leaving");

 	return ret;

 }

 

 static int _fini(void *data)

 {

 	int ret = QP_OK;

-

+	ERR("AMRIT inside softkey _fin");

 	ret = _unregister_module_event_handler(data);

-

+	ERR("AMRIT inside softkey _fini Before leaving");

 	return ret;

 }

 

@@ -179,7 +191,7 @@ static void _lang_changed(void *data)
 {

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

-

+	ERR("AMRIT inside softkey _lang_changed");

 	quickpanel_setting_module_icon_view_update_text(module);

 }

 

@@ -187,20 +199,24 @@ static void _refresh(void *data)
 {

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

-

+	ERR("AMRIT inside softkey _refresh");

 	quickpanel_setting_module_icon_view_update_text(module);

+	ERR("AMRIT inside softkey _refresh Before leaving");

 }

 

 static void _reset_icon(QP_Module_Setting *module)

 {

+	ERR("AMRIT inside softkey _reset_icon");

 	retif(module == NULL, , "Invalid parameter!");

 

 	quickpanel_setting_module_progress_mode_set(module, FLAG_DISABLE, FLAG_VALUE_VOID);

 	_status_update(module, FLAG_VALUE_VOID, FLAG_VALUE_VOID);

+	ERR("AMRIT inside softkey _reset_icon Before leaving");

 }

 

 static void _handler_on(void *data)

 {

+	ERR("AMRIT inside softkey _handler_on");

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

 

@@ -214,10 +230,12 @@ static void _handler_on(void *data)
 		ERR("the button is already turned on");

 		_reset_icon(module);

 	}

+	ERR("AMRIT inside softkey _handler_on Before leaving");

 }

 

 static void _handler_off(void *data)

 {

+	ERR("AMRIT inside softkey _handler_off");

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

 

@@ -231,26 +249,32 @@ static void _handler_off(void *data)
 		ERR("the button is already turned off");

 		_reset_icon(module);

 	}

+	ERR("AMRIT inside softkey _handler_off Before leaving");

 }

 

 static void _handler_progress_on(void *data)

 {

+	ERR("AMRIT inside softkey _handler_progress_on");

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

 

 	quickpanel_setting_module_progress_mode_set(module, FLAG_ENABLE, FLAG_VALUE_VOID);

+	ERR("AMRIT inside softkey _handler_progress_on Before leaving");

 }

 

 static void _handler_progress_off(void *data)

 {

+	ERR("AMRIT inside softkey _handler_progress_off");

 	QP_Module_Setting *module = (QP_Module_Setting *)data;

 	retif(module == NULL, , "Invalid parameter!");

 

 	_reset_icon(module);

+	ERR("AMRIT inside softkey _handler_progress_off Before leaving");

 }

 

 static int _handler_ipc(const char *command, void *data)

 {

+	ERR("AMRIT inside softkey _handler_ipc");

 	int i = 0;

 	retif(data == NULL, EINA_FALSE, "item data is NULL");

 	retif(command == NULL, EINA_FALSE, "command is NULL");

@@ -289,7 +313,7 @@ static int _handler_ipc(const char *command, void *data)
 		}

 		break;

 	}

-

+	ERR("AMRIT inside softkey _handler_ipc Before leaving");

 	return EINA_TRUE;

 }

 

diff --git a/src/settings/modules/sound-profile.c b/src/settings/modules/sound-profile.c
index e005e89..7e33574 100755
--- a/src/settings/modules/sound-profile.c
+++ b/src/settings/modules/sound-profile.c
@@ -191,8 +191,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 		img_path = BUTTON_ICON_SND_HIGHLIGHT;
 	break;
 	}
-
+	ERR("AMRIT sound _view_update Before");
 	quickpanel_setting_icon_state_set(view, icon_state);
+	ERR("AMRIT sound _view_update After");
 	quickpanel_setting_icon_text_set(view, text, icon_state);
 	image = quickpanel_setting_icon_image_new(view, img_path);
 	quickpanel_setting_icon_content_set(view, image);
diff --git a/src/settings/modules/wifi.c b/src/settings/modules/wifi.c
index 652f221..05790d8 100755
--- a/src/settings/modules/wifi.c
+++ b/src/settings/modules/wifi.c
@@ -86,9 +86,9 @@ static void _view_update(Evas_Object *view, int state, int flag_extra_1, int fla
 {
 	Evas_Object *image = NULL;
 	const char *icon_path = NULL;
-
+	ERR("AMRIT inside wifi _view_update Before");
 	quickpanel_setting_icon_state_set(view, state);
-
+	ERR("AMRIT inside wifi _view_update After");
 	if (state == ICON_VIEW_STATE_ON) {
 #ifdef BUTTON_ICON_HIGHLIGHT
 		icon_path = BUTTON_ICON_HIGHLIGHT;
diff --git a/src/settings/setting_module_api.c b/src/settings/setting_module_api.c
index f49f5b8..67d57ef 100755
--- a/src/settings/setting_module_api.c
+++ b/src/settings/setting_module_api.c
@@ -287,6 +287,7 @@ static void _progressbar_set(Evas_Object *view, int is_enable, int is_request_on
 		quickpanel_setting_icon_content_set(view, content);
 
 		quickpanel_setting_icon_state_progress_set(view);
+		ERR("AMRIT inside _progressbar_set");
 		quickpanel_setting_icon_state_set(view, ICON_VIEW_STATE_DIM);
 	}
 }
diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index 0adbbdf..7bb0275 100755
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" install-location="internal-only" package="org.tizen.quickpanel_common" version="1.0.0">
     <author email="jin0.kim@samsung.com" href="www.samsung.com">Jinyoung Kim</author>
-    <profile name="tizeniot"/>
+    <profile name="mobile"/>
     <ui-application appid="org.tizen.quickpanel" exec="quickpanel" hw-acceleration="on" launch_mode="single" multiple="false" nodisplay="true" process-pool="true" taskmanage="false" type="capp">
         <label>quickpanel</label>
         <icon>quickpanel.png</icon>