Merge change 3806 into donut

* changes:
  Fix a couple null pointer exceptions in CDMA voice call handling.

2 files changed, 7 insertions, 4 deletions

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
index 719e92c..da9fd0c 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
@@ -934,6 +934,7 @@ public final class CdmaCallTracker extends CallTracker {
                 droppedDuringPoll.clear();
             break;
 
+            case EVENT_REPOLL_AFTER_DELAY:
             case EVENT_CALL_STATE_CHANGE:
                 pollCallsWhenSafe();
             break;
diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java b/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
index 3833fc9..588bdf0 100644
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java
@@ -487,10 +487,12 @@ public class CdmaConnection extends Connection {
         }
 
         // A null cnapName should be the same as ""
-        if (TextUtils.isEmpty(dc.name) && !TextUtils.isEmpty(cnapName)) {
-            changed = true;
-            cnapName = "";
-        } else if (dc.name.equals(cnapName) == false) {
+        if (TextUtils.isEmpty(dc.name)) {
+            if (!TextUtils.isEmpty(cnapName)) {
+                changed = true;
+                cnapName = "";
+            }
+        } else if (!dc.name.equals(cnapName)) {
             changed = true;
             cnapName = dc.name;
         }