2496 CleanupStack::PopAndDestroy( 2 ); // manufacturerInUTF8, manufacturer |
2499 CleanupStack::PopAndDestroy( 2 ); // manufacturerInUTF8, manufacturer |
2497 |
2500 |
2498 PcdataNewL ( devInf->fwv, KNullDesC8() ); |
2501 PcdataNewL ( devInf->fwv, KNullDesC8() ); |
2499 |
2502 |
2500 // Mod element (model name) |
2503 // Mod element (model name) |
|
2504 TBool isOperator = EFalse; |
|
2505 TInt profileId( iAgent->ProfileId() ); |
|
2506 CNSmlDSSettings* settings = CNSmlDSSettings::NewLC(); |
|
2507 CNSmlDSProfile* profile = settings->ProfileL( profileId ); |
|
2508 |
|
2509 if( profile ) |
|
2510 { |
|
2511 CleanupStack::PushL( profile ); |
|
2512 isOperator = settings->IsOperatorProfileL( |
|
2513 profile->StrValue( EDSProfileServerId ) ); |
|
2514 CleanupStack::PopAndDestroy( profile ); |
|
2515 } |
|
2516 |
2501 HBufC* model = HBufC::NewLC( 50 ); |
2517 HBufC* model = HBufC::NewLC( 50 ); |
2502 TPtr modelPtr = model->Des(); |
2518 TPtr modelPtr = model->Des(); |
2503 iPhoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneModelId, modelPtr ); |
|
2504 HBufC8* modelInUTF8 = NULL; |
2519 HBufC8* modelInUTF8 = NULL; |
2505 NSmlUnicodeConverter::HBufC8InUTF8LC( *model, modelInUTF8 ); |
2520 if ( isOperator ) |
|
2521 { |
|
2522 modelInUTF8 = settings->OperatorProfileModValueLC(); |
|
2523 if ( modelInUTF8->Length() == 0 ) |
|
2524 { |
|
2525 CleanupStack::PopAndDestroy();// modelInUTF8 |
|
2526 iPhoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneModelId, modelPtr ); |
|
2527 NSmlUnicodeConverter::HBufC8InUTF8LC( *model, modelInUTF8 ); |
|
2528 } |
|
2529 } |
|
2530 else |
|
2531 { |
|
2532 iPhoneInfo->PhoneDataL( CNSmlPhoneInfo::EPhoneModelId, modelPtr ); |
|
2533 NSmlUnicodeConverter::HBufC8InUTF8LC( *model, modelInUTF8 ); |
|
2534 } |
2506 PcdataNewL ( devInf->mod, *modelInUTF8 ); |
2535 PcdataNewL ( devInf->mod, *modelInUTF8 ); |
2507 CleanupStack::PopAndDestroy( 2 ); // modelInUTF8, model |
2536 CleanupStack::PopAndDestroy( 2 ); // modelInUTF8, model |
2508 // SwV element (software version) |
2537 // SwV element (software version) |
2509 PcdataNewL ( devInf->swv, iPhoneInfo->SwVersionL() ); |
2538 if ( isOperator ) |
|
2539 { |
|
2540 HBufC8* swv = settings->OperatorProfileSWVValueLC(); |
|
2541 if ( swv->Length() > 0 ) |
|
2542 { |
|
2543 PcdataNewL ( devInf->swv, *swv ); |
|
2544 } |
|
2545 else |
|
2546 { |
|
2547 PcdataNewL ( devInf->swv, iPhoneInfo->SwVersionL() ); |
|
2548 } |
|
2549 CleanupStack::PopAndDestroy( swv ); |
|
2550 } |
|
2551 else |
|
2552 { |
|
2553 PcdataNewL ( devInf->swv, iPhoneInfo->SwVersionL() ); |
|
2554 } |
|
2555 |
|
2556 CleanupStack::PopAndDestroy( settings ); |
2510 |
2557 |
2511 PcdataNewL ( devInf->hwv, KNullDesC8() ); |
2558 PcdataNewL ( devInf->hwv, KNullDesC8() ); |
2512 |
2559 |
2513 // DevId element |
2560 // DevId element |
2514 HBufC* devId = HBufC::NewLC( 50 ); |
2561 HBufC* devId = HBufC::NewLC( 50 ); |