Tizen 2.4.0 rev3 SDK Public Release

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9505780..bbe6e6f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,10 +54,6 @@ ADD_DEFINITIONS("-DVENDOR=\"${APP_VENDOR}\"")
 ADD_DEFINITIONS("-DAPPNAME=\"${APP_NAME}\"")
 ADD_DEFINITIONS("-DAPP_DIR=\"${APP_DIR}\"")
 
-IF(TIZEN_WLAN_BOARD_SPRD)
-       ADD_DEFINITIONS(-DTIZEN_WLAN_BOARD_SPRD)
-ENDIF(TIZEN_WLAN_BOARD_SPRD)
-
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed -pie")
 
 ADD_CUSTOM_COMMAND(

diff --git a/include/mobileap_softap.h b/include/mobileap_softap.h
index f507323..d6da502 100755 (executable)
--- a/include/mobileap_softap.h
+++ b/include/mobileap_softap.h
@@ -97,7 +97,6 @@
 #define HOSTAPD_CONF_FILE      "/opt/var/lib/misc/hostapd.conf"
 #define HOSTAPD_CTRL_INTF_DIR  "/opt/var/lib/misc/hostapd"
 #define HOSTAPD_CONF_LEN       1024
-#ifndef TIZEN_WLAN_BOARD_SPRD
 #define HOSTAPD_CONF           "interface=%s\n" \
                                "driver=nl80211\n" \
                                "ctrl_interface=%s\n" \
@@ -107,19 +106,6 @@
                                "hw_mode=g\n" \
                                "max_num_sta=%d\n" \
                                "ieee80211n=1\n"
-#else
-#define HOSTAPD_CONF           "interface=%s\n" \
-                               "driver=nl80211\n" \
-                               "ctrl_interface=%s\n" \
-                               "ssid=%s\n" \
-                               "channel=%d\n" \
-                               "ignore_broadcast_ssid=%d\n" \
-                               "hw_mode=g\n" \
-                               "max_num_sta=%d\n" \
-                               "ieee80211n=1\n" \
-                               "wowlan_triggers=any\n"
-#endif
-
 #define HOSTAPD_DEBUG_FILE     "/var/log/hostapd.log"
 #define HOSTAPD_REQ_MAX_LEN    128
 #define HOSTAPD_RETRY_MAX      5

diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec
index 0d9f566..27c2ddd 100644 (file)
--- a/packaging/mobileap-agent.spec
+++ b/packaging/mobileap-agent.spec
@@ -1,6 +1,6 @@
 Name:          mobileap-agent
 Summary:       Mobile AP daemon for setting tethering environments
-Version:       1.0.36
+Version:       1.0.33
 Release:       1
 Group:         System/Network
 License:       Apache-2.0
@@ -53,9 +53,6 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %if "%{?tizen_profile_name}" == "tv"
        -DTIZEN_TV=1 \
 %endif
-%if "%{?tizen_target_name}" == "Z300H"
-       -DTIZEN_WLAN_BOARD_SPRD=1 \
-%endif
        .
 
 make %{?jobs:-j%jobs}

diff --git a/src/mobileap_main.c b/src/mobileap_main.c
index 8d544c0..7b7b5ba 100644 (file)
--- a/src/mobileap_main.c
+++ b/src/mobileap_main.c
@@ -462,6 +462,27 @@ static void on_bus_acquired_cb (GDBusConnection *connection, const gchar *name,
                        G_CALLBACK(tethering_get_station_info), NULL);
        g_signal_connect(tethering_obj, "handle-get-data-packet-usage",
                        G_CALLBACK(tethering_get_data_packet_usage), NULL);
+#ifdef __PRIVATE_CODE__
+       g_signal_connect(tethering_obj, "handle-cont-enable-wifi-tethering",
+                       G_CALLBACK(tethering_cont_enable_wifi_tethering), NULL);
+       g_signal_connect(tethering_obj, "handle-cont-enable-bt-tethering",
+                       G_CALLBACK(tethering_cont_enable_bt_tethering), NULL);
+       g_signal_connect(tethering_obj, "handle-cont-enable-usb-tethering",
+                       G_CALLBACK(tethering_cont_enable_usb_tethering), NULL);
+
+       g_signal_connect(tethering_obj, "handle-cancel-wifi-tethering",
+                       G_CALLBACK(tethering_cancel_enable_wifi_tethering), NULL);
+       g_signal_connect(tethering_obj, "handle-cancel-bt-tethering",
+                       G_CALLBACK(tethering_cancel_enable_bt_tethering), NULL);
+       g_signal_connect(tethering_obj, "handle-cancel-usb-tethering",
+                       G_CALLBACK(tethering_cancel_enable_usb_tethering), NULL);
+#endif
+
+#ifdef __PRIVATE_CODE__
+#if defined TIZEN_MDM_ENABLE
+       _register_mdm_policy_cb((void *)tethering_obj);
+#endif /* TIZEN_MDM_ENABLE */
+#endif /* __PRIVATE_CODE__ */
 
        _init_network((void *)tethering_obj);
        _register_vconf_cb((void *)tethering_obj);

diff --git a/src/mobileap_wifi.c b/src/mobileap_wifi.c
index 9423947..25f5fc2 100755 (executable)
--- a/src/mobileap_wifi.c
+++ b/src/mobileap_wifi.c
@@ -91,7 +91,6 @@ static void _wifi_direct_state_cb(int error_code, wifi_direct_device_state_e sta
                ERR("_enable_wifi_tethering is failed\n");
        } else {
                tethering_emit_wifi_on(obj);
-               _create_tethering_active_noti();
        }
 
 DONE:
@@ -140,7 +139,6 @@ static void __wifi_deactivated_cb(wifi_error_e result, void *user_data)
        } else {
                prev_wifi_on = TRUE;
                tethering_emit_wifi_on(obj);
-               _create_tethering_active_noti();
        }
 
 DONE:
@@ -343,7 +341,6 @@ mobile_ap_error_code_e _reload_softap_settings(Tethering *obj,
                return ret;
        }
        tethering_emit_wifi_on(obj);
-       _create_tethering_active_noti();
 
        return MOBILE_AP_ERROR_NONE;
 }