From: Philippe Nunes <philippe.nunes@linux.intel.com>
Date: Thu, 6 Sep 2012 14:26:29 +0000 (+0200)
Subject: stk: AID shall not be displayed in certain cases
X-Git-Tag: 1.12~319
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=94e35ff915fb3193d2043f85421b7ea07f98f64b;p=platform%2Fupstream%2Fofono.git

stk: AID shall not be displayed in certain cases

When the icon is marked as self explanatory, the AID should not be
displayed.
---

diff --git a/src/stk.c b/src/stk.c
index c0d722c..12f37b3 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -539,6 +539,18 @@ static gboolean stk_alpha_id_set(struct ofono_stk *stk,
 	if (stk->current_agent == NULL)
 		return FALSE;
 
+	/*
+	 * According to 3GPP TS 102.223 section 8.31:
+	 * If icon is self-explanatory, it replaces the alpha identifier or
+	 * text string.
+	 * If icon is not self-explanatory, it shall be displayed together
+	 * with the alpha identifier or text string.
+	 */
+
+	if (icon->id != 0 && icon->qualifier ==
+			STK_ICON_QUALIFIER_TYPE_SELF_EXPLANATORY)
+		alpha[0]='\0';
+
 	if (stk->respond_on_exit)
 		stk_agent_display_action(stk->current_agent, alpha, icon,
 						user_termination_cb, stk, NULL);