aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchand Ghosh <suchan@codeaurora.org>2014-04-24 14:33:34 +0530
committerSteve Kondik <shade@chemlab.org>2014-07-31 13:26:16 -0700
commita71dd2ba49c57930d313554e49d55d69c32d10cd (patch)
treefaeeb2177c925f8078c71e5f988d103a05567740
parentd43b5b1ca91e0aac0c697546a5cb341ffa758e0b (diff)
downloadandroid_frameworks_opt_telephony-a71dd2ba49c57930d313554e49d55d69c32d10cd.tar.gz
android_frameworks_opt_telephony-a71dd2ba49c57930d313554e49d55d69c32d10cd.tar.bz2
android_frameworks_opt_telephony-a71dd2ba49c57930d313554e49d55d69c32d10cd.zip
Fix voicemail count issue.
Telephony checks voicemail count stored in persist memory if SIM record returns count zero. Add code not to check voicemail count stored in persist phone memory if card read success and valid count is returned from card. Change-Id: I69ea6e5087dd49a550bbb4b6f6721729e8cd7f15 CRs-Fixed: 655038
-rw-r--r--src/java/com/android/internal/telephony/gsm/GSMPhone.java3
-rw-r--r--src/java/com/android/internal/telephony/uicc/SIMRecords.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index 3ba7d155b..b19bcca1d 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -317,7 +317,8 @@ public class GSMPhone extends PhoneBase {
// get voice mail count from SIM
countVoiceMessages = r.getVoiceMessageCount();
}
- if (countVoiceMessages == 0) {
+ //card read error or unknown voicemail count. Check count stored in persist memory.
+ if (countVoiceMessages == -1) {
countVoiceMessages = getStoredVoiceMessageCount();
}
Rlog.d(LOG_TAG, "updateVoiceMail countVoiceMessages = " + countVoiceMessages);
diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
index 9287bcc7b..d3e247cde 100644
--- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
@@ -450,7 +450,7 @@ public class SIMRecords extends IccRecords {
public int getVoiceMessageCount() {
boolean voiceMailWaiting = false;
- int countVoiceMessages = 0;
+ int countVoiceMessages = -1;
if (mEfMWIS != null) {
// Use this data if the EF[MWIS] exists and
// has been loaded