diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:38:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:38:12 -0700 |
commit | 2795c2d6b73f6e72565569f7d4f2f4b34e526bba (patch) | |
tree | 6cbac878d8ce411596902d4c1a64b579efa94049 /telephony | |
parent | 1f35bf18ade606810843c8ec10445fc884d686cb (diff) | |
parent | 4be0d4378c3d9c79a094e99ce429907f1e9eda5f (diff) | |
download | frameworks_base-2795c2d6b73f6e72565569f7d4f2f4b34e526bba.zip frameworks_base-2795c2d6b73f6e72565569f7d4f2f4b34e526bba.tar.gz frameworks_base-2795c2d6b73f6e72565569f7d4f2f4b34e526bba.tar.bz2 |
Merge change 3806 into donut
* changes:
Fix a couple null pointer exceptions in CDMA voice call handling.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java | 1 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java | 10 |
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; } |