Merge "Send updateHeadsetPhoneState when child calls change" into oc-dr1-dev

    private int mNumActiveCalls = 0;

    private int mNumHeldCalls = 0;

    private int mNumChildrenOfActiveCall = 0;

    private int mBluetoothCallState = CALL_STATE_IDLE;

    private String mRingingAddress = null;

    private int mRingingAddressType = 0;

        int numActiveCalls = activeCall == null ? 0 : 1;

        int numHeldCalls = mCallsManager.getNumHeldCalls();

        int numChildrenOfActiveCall = activeCall == null ? 0 : activeCall.getChildCalls().size();

        // Intermediate state for GSM calls which are in the process of being swapped.

        // TODO: Should we be hardcoding this value to 2 or should we check if all top level calls

        //       are held?

                (force ||

                        (!callsPendingSwitch &&

                                (numActiveCalls != mNumActiveCalls ||

                                        numChildrenOfActiveCall != mNumChildrenOfActiveCall ||

                                        numHeldCalls != mNumHeldCalls ||

                                        bluetoothCallState != mBluetoothCallState ||

                                        !TextUtils.equals(ringingAddress, mRingingAddress) ||

            mOldHeldCall = heldCall;

            mNumActiveCalls = numActiveCalls;

            mNumChildrenOfActiveCall = numChildrenOfActiveCall;

            mNumHeldCalls = numHeldCalls;

            mBluetoothCallState = bluetoothCallState;

            mRingingAddress = ringingAddress;