Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 3806 into donut

Browse Source 
* changes:
  Fix a couple null pointer exceptions in CDMA voice call handling.
This commit is contained in:
Android (Google) Code Review
2009-06-10 16:38:12 -07:00
parent 1f35bf18ad 4be0d4378c
commit 2795c2d6b7
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
View File

@@ -934,6 +934,7 @@ public final class CdmaCallTracker extends CallTracker {
droppedDuringPoll.clear(); droppedDuringPoll.clear();
break; break;
case EVENT_REPOLL_AFTER_DELAY:
case EVENT_CALL_STATE_CHANGE: case EVENT_CALL_STATE_CHANGE:
pollCallsWhenSafe(); pollCallsWhenSafe();
break; break;

10
telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
View File

@@ -487,10 +487,12 @@ public class CdmaConnection extends Connection {
} }
// A null cnapName should be the same as "" // A null cnapName should be the same as ""
if (TextUtils.isEmpty(dc.name) && !TextUtils.isEmpty(cnapName)) { if (TextUtils.isEmpty(dc.name)) {
changed = true; if (!TextUtils.isEmpty(cnapName)) {
cnapName = ""; changed = true;
} else if (dc.name.equals(cnapName) == false) { cnapName = "";
}
} else if (!dc.name.equals(cnapName)) {
changed = true; changed = true;
cnapName = dc.name; cnapName = dc.name;
} }