Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f84953a authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 2795c2d6: Merge change 3806 into donut 

Merge commit '2795c2d6'

* commit '2795c2d6':
  Fix a couple null pointer exceptions in CDMA voice call handling.
parents ca83b1b1 2795c2d6

telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -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;

telephony/java/com/android/internal/telephony/cdma/CdmaConnection.java

+6 −4
Original line number Diff line number Diff line
@@ -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)) {

        if (TextUtils.isEmpty(dc.name)) {

            if (!TextUtils.isEmpty(cnapName)) {

                changed = true;

                cnapName = "";

        } else if (dc.name.equals(cnapName) == false) {

            }

        } else if (!dc.name.equals(cnapName)) {

            changed = true;

            cnapName = dc.name;

        }