From 55a6ef08adcc1e75439d31cbdd9d4dce72fabe7d Mon Sep 17 00:00:00 2001
From: lokilee73 <changjoo.lee@samsung.com>
Date: Mon, 6 Jul 2020 16:09:34 +0900
Subject: [PATCH] Remove unused battery related notification code

Change-Id: Ied65063d3b01049ed69817b5efb3d2c040faa56e
Signed-off-by: lokilee73 <changjoo.lee@samsung.com>
---
 data/noti_charging_battery_low.png | Bin 1410 -> 0 bytes
 packaging/system-servant.spec      |   1 -
 src/launcher/CMakeLists.txt        |   1 -
 src/launcher/launcher.c            |  58 --------------
 src/launcher/launcher.h            |   1 -
 src/launcher/noti.c                | 151 -------------------------------------
 6 files changed, 212 deletions(-)
 delete mode 100644 data/noti_charging_battery_low.png

diff --git a/data/noti_charging_battery_low.png b/data/noti_charging_battery_low.png
deleted file mode 100644
index 954d929bd776b827e514698b5ac60d270c198324..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1410
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87
z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$
zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`<jAm(=3qqRfJl%=|nBkco*&`K2Yc
zN<f!FypUVq>kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0
zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$*tGSD-
zk%h6LiHoa=p`nwhv757nqpPE%rKOvNn+41ata{xXO)Lx?4NVM;3=IukO)brgjVzrE
z9i2>FU7Re;j9_{_^NLFn^O93x_GW_Yh3GZFtJli8C^fMpzbGU>KL?fq0y6ST@{2R_
z3lyA#%@j1kGxJjN%ZoKZ(F5_VOKMSOS!#+~QGTuhIDD-#vDoiuY2sw&<Z5c@Y+?W;
zf&R8Iws16bG`2J_ceZeIQ-bPEAt%iAfsWA!B@U#-0uutJKoAq2^no0B=1I*1=9nU2
z)-YyFWM^Pt+~n!v7*cWT&Fs@&haDtZm&ZBo*|I2it^Wh3J3C4i2MGLPitXYqe0+*s
z=<W}WrVjs$t=#5zjkmbEwtwMS8{jnIWXl<q&-3N^wp{j`T{F|Nc+vzf5m&FGP>u!$
z5IW$i>wLNG{@<p1PD};-Z<oI*=9Fz^NMNnn_~JWP=;wPoG*$O-I9N5z?D?DB_AdXa
zf7^cf$SR*S;Vp&V_PpZD+Rd_o<!kq}%$O<%gL?-<!G=n-*jz2n;au${$;h0+9W{4?
zU(M|cyIC0eFE~3@^H)t`Sn%_F`s;I#7pIDB+k0Z+Yw20-b;)mcy<MymXtDa^I@K-a
zD!R?mn#<h^7$)_Vc?&g6`=WVaf*tFuwtWhxSYBURen8Eg!PbF~L3XLQ+P&+?0wZ`B
zV%0C`n6S_Nb&Eq@-FfF*@0)H8id_sg|Nk%lR3N#AgQ0GLaYkV8JGuF*FUH0hs#P$`
z9>2A2;W`oFH<H^}ty!%$Dldzd_hKqwh;`h3;atU!_l6uGD9FGl07MRwMGbbHk{;(6
ze`WUFW_tUl_qE`M@JzYplb^5bde7Yu!LPu;1VkK*+L(A4_PG^t+!K=R29=7Qu6{1-
HoD!M<F9hUc

diff --git a/packaging/system-servant.spec b/packaging/system-servant.spec
index 6c57c7b..81fec37 100644
--- a/packaging/system-servant.spec
+++ b/packaging/system-servant.spec
@@ -556,7 +556,6 @@ mv /%{TZ_SYS_RO_APP}/org.tizen.powerkey-syspopup/bin/powerkey-popup.wearable /%{
 %{_bindir}/system-cooperator
 %{_datadir}/system-apps/res/icons/batt_full_icon.png
 %{_datadir}/system-apps/res/icons/batt_full_indicator.png
-%{_datadir}/system-apps/res/icons/noti_charging_battery_low.png
 %{_datadir}/system-apps/res/icons/noti_cooling_down.png
 %{_datadir}/system-apps/res/icons/datausage_warning.png
 %{_datadir}/system-apps/res/icons/led_torch.png
diff --git a/src/launcher/CMakeLists.txt b/src/launcher/CMakeLists.txt
index 5f1f4ab..38b991e 100644
--- a/src/launcher/CMakeLists.txt
+++ b/src/launcher/CMakeLists.txt
@@ -55,7 +55,6 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/datausage_warning.png  DESTINATION ${SYST
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/led_torch.png          DESTINATION ${SYSTEM_ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/batt_full_icon.png     DESTINATION ${SYSTEM_ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/batt_full_indicator.png      DESTINATION ${SYSTEM_ICONDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/noti_charging_battery_low.png     DESTINATION ${SYSTEM_ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/usb_icon.png          DESTINATION ${SYSTEM_ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/noti_cooling_down.png   DESTINATION ${SYSTEM_ICONDIR})
 ENDIF(NOTIFICATION_SERVICE STREQUAL on)
diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c
index f131603..7f465e8 100644
--- a/src/launcher/launcher.c
+++ b/src/launcher/launcher.c
@@ -119,54 +119,6 @@ static DBusMessage *battery_charge_noti_on(E_DBus_Object *obj, DBusMessage *msg)
 	return launch_system_servant_app(obj, msg, args);
 }
 
-static DBusMessage *battery_low_noti_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_LOW);
-}
-
-static DBusMessage *battery_critical_noti_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_CRITICAL);
-}
-
-static DBusMessage *battery_low_actnoti_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_single_param(obj, msg, BATTERY_LOW_ACT);
-}
-
-static DBusMessage *battery_critical_actnoti_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_single_param(obj, msg, BATTERY_CRITICAL_ACT);
-}
-
-static DBusMessage *battery_low_actnoti_usb_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_LOW_USB_ACT);
-}
-
-static DBusMessage *battery_critical_actnoti_usb_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_CRITICAL_USB_ACT);
-}
-
-static DBusMessage *battery_low_actnoti_chg_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_LOW_CHG_ACT);
-}
-
-static DBusMessage *battery_critical_actnoti_chg_on(E_DBus_Object *obj, DBusMessage *msg)
-{
-	set_timer_to_terminate();
-	return activate_notification_no_param(obj, msg, BATTERY_CRITICAL_CHG_ACT);
-}
-
 /* Datausage */
 static DBusMessage *data_warning_noti_on(E_DBus_Object *obj, DBusMessage *msg)
 {
@@ -276,16 +228,6 @@ dbus_noti_methods[] = {
 	{ "BatteryFullNotiOn"		, NULL		, "i"	, battery_full_noti_on		},
 	{ "BatteryFullNotiOff"		, "i"		, "i"	, noti_off			},
 	{ "BatteryChargeNotiOn"		, NULL		, "i"	, battery_charge_noti_on	},
-	{ "BatteryLowNotiOn"		, NULL		, "i"	, battery_low_noti_on	},
-	{ "BatteryCriticalNotiOn"	, NULL		, "i"	, battery_critical_noti_on	},
-	{ "BatteryLowCriticalNotiOff"	, "i"		, "i"	, noti_off	},
-	/* Battery Active noti*/
-	{ "BatteryLowActNotiOn"		, "s"		, "i"	, battery_low_actnoti_on	},
-	{ "BatteryCriticalActNotiOn",	"s"		, "i"	, battery_critical_actnoti_on	},
-	{ "BatteryLowActNotiUsbOn"	, NULL		, "i"	, battery_low_actnoti_usb_on	},
-	{ "BatteryCriticalActNotiUsbOn"	, NULL	, "i"	, battery_critical_actnoti_usb_on	},
-	{ "BatteryLowActNotiChgOn"	, NULL		, "i"	, battery_low_actnoti_chg_on	},
-	{ "BatteryCriticalActNotiChgOn"	, NULL	, "i"	, battery_critical_actnoti_chg_on	},
 	/* Temperature */
 	{ "TempCooldownNotiOn"		, NULL		, "i"	, cooldown_noti_on		},
 	{ "TempCooldownNotiOff"		, "i"		, "i"	, noti_off			},
diff --git a/src/launcher/launcher.h b/src/launcher/launcher.h
index ab776dd..d194bae 100644
--- a/src/launcher/launcher.h
+++ b/src/launcher/launcher.h
@@ -56,7 +56,6 @@
 #define USB_ICON         SYSTEM_ICONDIR"/usb_icon.png"
 #define BATT_INDI_ICON   SYSTEM_ICONDIR"/batt_full_indicator.png"
 #define BATT_NOTI_ICON   SYSTEM_ICONDIR"/batt_full_icon.png"
-#define BATT_LOW_INDI_ICON SYSTEM_ICONDIR"/noti_charging_battery_low.png"
 #define COOLDOWN_NOTI_ICON   SYSTEM_ICONDIR"/noti_cooling_down.png"
 
 
diff --git a/src/launcher/noti.c b/src/launcher/noti.c
index d2ddccf..05b830d 100644
--- a/src/launcher/noti.c
+++ b/src/launcher/noti.c
@@ -70,26 +70,6 @@ static void set_language(void)
 	free(lang);
 }
 
-notification_error_e set_contents_for_lowbat_noti(char *title, notification_h noti, char *content, char *sig, va_list args)
-{
-	int var = 0;
-	notification_error_e noti_err = NOTIFICATION_ERROR_INVALID_PARAMETER;
-
-	if (strncmp(sig, "i", 1))
-		return noti_err;
-
-	var = va_arg(args, int);
-	noti_err = notification_set_text(noti,
-			NOTIFICATION_TEXT_TYPE_CONTENT,
-			_(content),
-			content,
-			NOTIFICATION_VARIABLE_TYPE_INT,
-			var,
-			NOTIFICATION_VARIABLE_TYPE_NONE);
-
-	return noti_err;
-}
-
 static int add_notification(
 		int type, int layout,
 		char *title, char *content,
@@ -626,41 +606,6 @@ static int launch_usb_device_notification(char *dev, char *name)
 	return ret;
 }
 
-static int launch_battery_discharge_active_notification(void *data, int type)
-{
-	int ret;
-	bundle *b;
-	char *title = NULL;
-	int capacity = atoi(data);
-
-	b = bundle_create();
-	if (b)
-		appsvc_set_pkgname(b, SYSTEM_SIGNAL_SENDER);
-
-	if (type == BATTERY_LOW_ACT)
-		title = "IDS_QP_HEADER_BATTERY_LOW_ABB";
-	else if (type == BATTERY_CRITICAL_ACT)
-		title = "IDS_QP_HEADER_BATTERY_CRITICALLY_LOW_ABB";
-
-	ret =  add_notification(NOTIFICATION_TYPE_NOTI,
-			NOTIFICATION_LY_ONGOING_EVENT,
-			title,
-			"IDS_QP_POP_YOUR_DEVICE_HAS_PDP_BATTERY_POWER_REMAINING_CONNECT_A_CHARGER_ABB",
-			BATT_LOW_INDI_ICON,
-			NULL,
-			b,
-			NOTIFICATION_PROP_VOLATILE_DISPLAY,
-			NOTIFICATION_DISPLAY_APP_ACTIVE,
-			set_contents_for_lowbat_noti,
-			"i",
-			capacity);
-
-	if (b)
-		bundle_free(b);
-
-	return ret;
-}
-
 static int launch_ticker_notification(void *data)
 {
 	char *content, *input;
@@ -723,10 +668,6 @@ static int launch_battery_notification(int type)
 {
 	int ret = -EINVAL;
 
-#ifndef PROFILE_MOBILE  // event noti should be supported in mobile profile only
-	return ret;
-#endif
-
 	if (type == BATTERY_FULL) {
 	ret =  add_notification(NOTIFICATION_TYPE_ONGOING,
 				NOTIFICATION_LY_ONGOING_EVENT,
@@ -739,88 +680,6 @@ static int launch_battery_notification(int type)
 				NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY,
 				NULL,
 				NULL);
-	} else if (type == BATTERY_LOW) {
-		ret =  add_notification(NOTIFICATION_TYPE_ONGOING,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_LOW_ABB",
-				"IDS_QP_SBODY_CONNECT_A_CHARGER_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_DISABLE_APP_LAUNCH,
-				NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY,
-				NULL,
-				NULL);
-	} else if (type == BATTERY_CRITICAL) {
-		ret =  add_notification(NOTIFICATION_TYPE_ONGOING,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_CRITICALLY_LOW_ABB",
-				"IDS_QP_SBODY_CONNECT_A_CHARGER_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_DISABLE_APP_LAUNCH,
-				NOTIFICATION_DISPLAY_APP_NOTIFICATION_TRAY,
-				NULL,
-				NULL);
-	} else
-		_E("Unknown type(%d).", type);
-
-	return ret;
-}
-
-static int launch_battery_active_notification(int type)
-{
-	int ret = -EINVAL;
-
-	if (type == BATTERY_LOW_USB_ACT) {
-		ret =  add_notification(NOTIFICATION_TYPE_NOTI,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_LOW_ABB",
-				"IDS_QP_POP_USE_A_PLUG_SOCKET_AND_CLOSE_UNUSED_APPS_FOR_QUICKER_CHARGING_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_VOLATILE_DISPLAY,
-				NOTIFICATION_DISPLAY_APP_ACTIVE,
-				NULL,
-				NULL);
-	} else if (type == BATTERY_CRITICAL_USB_ACT) {
-		ret =  add_notification(NOTIFICATION_TYPE_NOTI,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_CRITICALLY_LOW_ABB",
-				"IDS_QP_POP_USE_A_PLUG_SOCKET_AND_CLOSE_UNUSED_APPS_FOR_QUICKER_CHARGING_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_VOLATILE_DISPLAY,
-				NOTIFICATION_DISPLAY_APP_ACTIVE,
-				NULL,
-				NULL);
-	} else if (type == BATTERY_LOW_CHG_ACT) {
-		ret =  add_notification(NOTIFICATION_TYPE_NOTI,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_LOW_ABB",
-				"IDS_QP_POP_CONTINUED_USAGE_WHILE_CHARGING_MAY_PREVENT_EFFICIENT_CHARGING_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_VOLATILE_DISPLAY,
-				NOTIFICATION_DISPLAY_APP_ACTIVE,
-				NULL,
-				NULL);
-	} else if (type == BATTERY_CRITICAL_CHG_ACT) {
-		ret =  add_notification(NOTIFICATION_TYPE_NOTI,
-				NOTIFICATION_LY_ONGOING_EVENT,
-				"IDS_QP_HEADER_BATTERY_CRITICALLY_LOW_ABB",
-				"IDS_QP_POP_CONTINUED_USAGE_WHILE_CHARGING_MAY_PREVENT_EFFICIENT_CHARGING_ABB",
-				BATT_LOW_INDI_ICON,
-				NULL,
-				NULL,
-				NOTIFICATION_PROP_VOLATILE_DISPLAY,
-				NOTIFICATION_DISPLAY_APP_ACTIVE,
-				NULL,
-				NULL);
 	} else
 		_E("Unknown type(%d).", type);
 
@@ -861,14 +720,7 @@ static int launch_notification_no_param_by_type(int type)
 	case TIMA_PKM_DETECTION:
 		return launch_tima_pkm_detection_notification();
 	case BATTERY_FULL:
-	case BATTERY_LOW:
-	case BATTERY_CRITICAL:
 		return launch_battery_notification(type);
-	case BATTERY_LOW_USB_ACT:
-	case BATTERY_CRITICAL_USB_ACT:
-	case BATTERY_LOW_CHG_ACT:
-	case BATTERY_CRITICAL_CHG_ACT:
-		return launch_battery_active_notification(type);
 	case MEDIA_DEVICE:
 		return launch_media_device_notification();
 	case TEMP_COOLDOWN:
@@ -893,9 +745,6 @@ static int launch_notification_single_param_by_type(int type, void *data)
 	case USB_STORAGE:
 	case USB_STORAGE_RO:
 		return launch_usb_storage_notification(data, type);
-	case BATTERY_LOW_ACT:
-	case BATTERY_CRITICAL_ACT:
-		return launch_battery_discharge_active_notification(data, type);
 	default:
 		_E("Noti type is unknown.");
 		return -EINVAL;
-- 
2.7.4