Projects >> frameworks_base_disabled >>90b34b37731307cd0ccd5dfa60971364b37515d8

Chunk
Conflicting content
                }
                break;

<<<<<<< HEAD
=======
            case EVENT_POLL_STATE_CDMA_SUBSCRIPTION: // Handle RIL_CDMA_SUBSCRIPTION
                String cdmaSubscription[] = (String[])ar.result;

                if (cdmaSubscription != null && cdmaSubscription.length >= 4) {
                    mMdn = cdmaSubscription[0];
                    // TODO: Only grabbing the first SID/NID for now.
                    if (cdmaSubscription[1] != null) {
                        String[] sid = cdmaSubscription[1].split(",");
                        mHomeSystemId = sid.length > 0 ? Integer.parseInt(sid[0]) : 0;
                    }
                    if (cdmaSubscription[2] != null) {
                        String[] nid = cdmaSubscription[2].split(",");
                        mHomeNetworkId = nid.length > 0 ? Integer.parseInt(nid[0]) : 0;
                    }
                    mMin = cdmaSubscription[3];

                } else {
                    Log.w(LOG_TAG, "error parsing cdmaSubscription");
                }
                break;

>>>>>>> 8e0fb366fcc9897291f68245b2cb4e86f5161ded
            default:
                Log.e(LOG_TAG, "RIL response handle in wrong phone!"
                    + " Expected CDMA RIL request and get GSM RIL request.");
Solution content
                }
                break;

            default:
                Log.e(LOG_TAG, "RIL response handle in wrong phone!"
                    + " Expected CDMA RIL request and get GSM RIL request.");
File
CdmaServiceStateTracker.java
Developer's decision
Version 1
Kind of conflict
Break statement
Case statement
Cast expression
Comment
If statement
Variable