FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/nokiatsy

equal deleted inserted replaced

-:fa67e03b87df
+:6295dc2169f3
 /*
-* Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 // MACROS
 //None
 // LOCAL CONSTANTS AND MACROS
-const TUint8 KPhoneTransId = 6; //hard coded transaction ID
+const TUint8 KPhoneTransId = 6;
-const TUint8 KImsiSize = 8;
 const TUint8 KServiceProviderSize = 36;
 const TUint8 KSpnFileSize = 16;
 const TUint8 KServiceAcl( 35 );
 const TUint8 KAclStateMask( 4 );
 const TUint8 KNumOfApnsIndex( 0 );
 const TUint8 KApnDataIndex( 1 );
+const TUint8 KCpsLength( 18 );
+const TUint8 KSpnLength( 17 );
+const TUint8 KLineInfoLength( 1 );
+const TUint8 KAclStatusLength( 1 );
+const TUint8 KImsiSize = 9;
+const TUint8 KUnusedNibble = 0x0F;
+const TUint8 KImsiStringByteCount = 0;
+const TUint8 KFirstImsiDigit = 1;
+const TUint8 KSecondImsiDigit = 2;
+const TUint8 KNibbleMask = 0x0f;
+const TUint8 KNibbleShift = 4;
 // ------------------------------------------------------
 // --- Alternate Line Service (ALS)-related constants ---
 // ------------------------------------------------------
 // Consts for mapping the Als Line values, as used in SIMSON's
 // SIM_SERV_DYNAMIC_FLAGS_STR structure.
-const TUint8 KAlsAuxiliaryLine = 0x00; // ALS alternate line
+const TUint8 KAlsAuxiliaryLine = 0x00;
-const TUint8 KAlsPrimaryLine = 0x01;   // ALS primary line
+const TUint8 KAlsPrimaryLine = 0x01;
 // ----------------------------------------------
 // --- (U)ICC Service Table-related constants ---
 // ----------------------------------------------
 // Creates a new PhoneMessageHandler object instance.
 // --------------------------------------------------------------------------
 //
 CMmPhoneMessHandler* CMmPhoneMessHandler::NewL
 (
-CMmPhoNetSender* aPhoNetSender,  //a ptr to the phonet sender
+CMmPhoNetSender* aPhoNetSender,
-CMmPhoNetReceiver* aPhoNetReceiver,  //a ptr to the phonet receiver
+CMmPhoNetReceiver* aPhoNetReceiver,
-CMmMessageRouter* aMessageRouter, // pointer to the msg router
+CMmMessageRouter* aMessageRouter,
 CMmSupplServMessHandler* aSupplServMessHandler,
 CMmUiccMessHandler* aUiccMessHandler
 )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::NewL");
 CMmPhoneMessHandler* phoneMessHandler =
 new ( ELeave ) CMmPhoneMessHandler();
 CleanupStack::PushL( phoneMessHandler );
 phoneMessHandler->iPhoNetSender = aPhoNetSender;
-phoneMessHandler->ConstructL( aMessageRouter );
+phoneMessHandler->ConstructL(
-phoneMessHandler->iSupplServMessHandler = aSupplServMessHandler;
+aMessageRouter,
-phoneMessHandler->iMmUiccMessHandler = aUiccMessHandler;
+aPhoNetSender,
+aSupplServMessHandler,
+aUiccMessHandler );
 aPhoNetReceiver->RegisterL(
 phoneMessHandler,
 #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING
 PN_INFO,
 // Initialises object attributes.
 // --------------------------------------------------------------------------
 //
 void CMmPhoneMessHandler::ConstructL
 (
-CMmMessageRouter* aMessageRouter
+CMmMessageRouter* aMessageRouter,
+CMmPhoNetSender* aPhoNetSender,
+CMmSupplServMessHandler* aSupplServMessHandler,
+CMmUiccMessHandler* aUiccMessHandler
 )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::ConstructL");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CONSTRUCTL, "CMmPhoneMessHandler::ConstructL" );
-// Internal pointers, must be nulled before used.
+iPhoNetSender = aPhoNetSender;
+iSupplServMessHandler = aSupplServMessHandler;
+iMmUiccMessHandler = aUiccMessHandler;
+iMessageRouter = aMessageRouter;
 iSSTFileData = NULL;
 iStoreInfo = NULL;
 iLocIndex = 0;
-iMessageRouter = aMessageRouter;
 iCommonTSYRefreshPending = EFalse;
 iRefreshError = EFalse;
 iCompleteRefresfDone = EFalse;
 iInternalRefreshFiles = 0;
 CMmPhoneMessHandler::~CMmPhoneMessHandler()
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler destructed.");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_CMMPHONEMESSHANDLER, "CMmPhoneMessHandler::~CMmPhoneMessHandler" );
-// Delete iStoreInfo and set it to NULL, if it exist.
 if( iStoreInfo )
 {
 delete iStoreInfo;
 }
-// Delete iSSTFileData and set it to NULL, if it exist.
 if( iSSTFileData )
 {
-// Delete object
 delete iSSTFileData;
 }
 if( iAPNList )
 {
 // --------------------------------------------------------------------------
 //
 TInt CMmPhoneMessHandler::ExtFuncL
 (
 TInt aIpc,
-const CMmDataPackage* aDataPackage // Data package
+const CMmDataPackage* aDataPackage
 )
 {
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::ExtFuncL. Licensee specific implemtantion. IPC: %d", aIpc);
 OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_EXTFUNCL, "CMmPhoneMessHandler::ExtFuncL;Licensee specific implemtantion aIpc=%d", aIpc );
-//*************************************************************//
-// NOTE.
-//
-// LICENSEE SPECIFIC MESSAGE HANDLER IMPLEMENTATION STARTS HERE
-//
-//*************************************************************//
 TInt ret( KErrNone );
 TUint8 transId( KPhoneTransId );
 switch ( aIpc )
 {
 break;
 }
 case EMobilePhoneSetALSLine:
 {
 TUint8 alsLine;
-aDataPackage->UnPackData( alsLine );
+if ( aDataPackage )
-ret = UiccWriteDynamicFlagsReq( alsLine );
+{
+aDataPackage->UnPackData( alsLine );
+ret = UiccWriteDynamicFlagsReq( alsLine );
+}
+else
+{
+ret = KErrArgument;
+}
 break;
 }
 case EMobilePhoneGetCustomerServiceProfile:
 {
 ret = UiccCspFileReq();
 // message has been received.
 // --------------------------------------------------------------------------
 //
 void CMmPhoneMessHandler::ReceiveMessageL
 (
-const TIsiReceiveC &aIsiMessage  // ISI message received
+const TIsiReceiveC &aIsiMessage
 )
 {
 TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) );
 TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 case PN_INFO:
 #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */
 case PN_MODEM_INFO:
 #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */
 {
-switch( messageId )
+if ( INFO_SERIAL_NUMBER_READ_RESP == messageId )
 {
-case INFO_SERIAL_NUMBER_READ_RESP:
+InfoSerialNumberReadResp( aIsiMessage );
-{
+}
-InfoSerialNumberReadResp( aIsiMessage );
+else
-break;
+{
-}
-default:
-{
 TFLOGSTRING("TSY: CMmPhoneMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_INFO, switch messageId - default.\n" );
 OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_INFO, switch messageId - default" );
-break;
-}
 }
 break; // end case PN_MODEM_INFO
 }
 case PN_UICC:
 {
-switch( messageId )
+if ( UICC_REFRESH_IND == messageId )
 {
-case UICC_REFRESH_IND:
+UiccRefreshInd( aIsiMessage );
-{
+}
-UiccRefreshInd( aIsiMessage );
+else if ( UICC_REFRESH_RESP == messageId )
-break;
+{
-}
+UiccRefreshResp( aIsiMessage );
-case UICC_REFRESH_RESP:
+}
-{
+// No else
-UiccRefreshResp( aIsiMessage );
+break;
-break;
+}
-}
+default:
-default:
-{
-break;
-}
-}
-break;
-}
-default:
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::ReceiveMessageL, switch resource - default.\n" );
 OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - default" );
 break;
 }
 } // End of switch
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::InfoSerialNumberReadReq
-// Constructs INFO_SERIAL_NUMBER_READ_REQ ISI message..
+// Constructs INFO_SERIAL_NUMBER_READ_REQ ISI message.
 // Returns KErrNone on success, other error value on failure.
 // --------------------------------------------------------------------------
 //
 TInt CMmPhoneMessHandler::InfoSerialNumberReadReq
 (
-TUint8 aTransactionId, // transaction id
+TUint8 aTransactionId,
 TUint8 aTarget // type of requested serial number
 )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::InfoSerialNumberReadReq.");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADREQ, "CMmPhoneMessHandler::InfoSerialNumberReadReq" );
 {
 TInt err( KErrNotFound );
 TBuf8<KSerialNumberLength> serialData;
-// Get status
 TUint8 status( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + INFO_SERIAL_NUMBER_READ_RESP_OFFSET_STATUS ) );
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::InfoSerialNumberReadResp, status=0x%02x",status);
 OstTraceExt1( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADRESP, "CMmPhoneMessHandler::InfoSerialNumberReadResp;status=%hhx", status );
-// If status is Ok get information from possible sub block(s).
+// Get information from possible sub block(s).
 if ( INFO_OK == status )
 {
+TBool subblockFound( EFalse );
+TUint sbSerialNumberStartOffset( 0 );
 // If sub blocks
 if ( 0 != aIsiMessage.Get8bit(
 ISI_HEADER_SIZE +
 INFO_SERIAL_NUMBER_READ_RESP_OFFSET_SUBBLOCKCOUNT ) )
 {
-TUint sbSerialNumberStartOffset( 0 );
+subblockFound = ETrue;
+}
-if ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
-ISI_HEADER_SIZE + SIZE_INFO_SERIAL_NUMBER_READ_RESP,
+if ( subblockFound && ( KErrNone == aIsiMessage.FindSubBlockOffsetById(
-INFO_SB_SN_IMEI_PLAIN,
+ISI_HEADER_SIZE + SIZE_INFO_SERIAL_NUMBER_READ_RESP,
-EIsiSubBlockTypeId8Len8,
+INFO_SB_SN_IMEI_PLAIN,
-sbSerialNumberStartOffset ) )
+EIsiSubBlockTypeId8Len8,
-{
+sbSerialNumberStartOffset ) ) )
-// Read the string length - the zero terminator...
+{
-TUint8 strLength( aIsiMessage.Get8bit(
+// Read the string length - the zero terminator
-sbSerialNumberStartOffset +
+TUint8 strLength( aIsiMessage.Get8bit(
-INFO_SB_SN_IMEI_PLAIN_OFFSET_STRLEN ) - 1 );
+sbSerialNumberStartOffset +
-// ...and compare it to the available buffer size
+INFO_SB_SN_IMEI_PLAIN_OFFSET_STRLEN ) - 1 );
-// (50 bytes in etel),
-// and choose the shorter one strLength =
+TUint8 dataOffset(
-// ( RMobilePhone::KPhoneSerialNumberSize > strLength )?
+sbSerialNumberStartOffset +
-// strLength : RMobilePhone::KPhoneSerialNumberSize;
+INFO_SB_SN_IMEI_PLAIN_OFFSET_IMEIPLAINU8 );
-TUint8 dataOffset(
+serialData.Append( aIsiMessage.GetData(
-sbSerialNumberStartOffset +
+dataOffset,
-INFO_SB_SN_IMEI_PLAIN_OFFSET_IMEIPLAINU8 );
+strLength ).Left( KSerialNumberLength ) );
-serialData.Append( aIsiMessage.GetData(
+err = KErrNone;
-dataOffset,
+}
-strLength ).Left( KSerialNumberLength ) );
+}
-err = KErrNone;
-}
-}
-}
-// Complete to CommonTSY, ONLY if all data has already been received
-// packed parameter: TBuf8<KSerialNumberLength> serialData
 CMmDataPackage dataPackage;
 dataPackage.PackData( &serialData );
 iMessageRouter->Complete( EMobilePhoneGetPhoneId, &dataPackage, err );
 }
 TInt CMmPhoneMessHandler::UiccReadDynamicFlagsReq()
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadDynamicFlagsReq");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADDYNAMICFLAGSREQ, "CMmPhoneMessHandler::UiccReadDynamicFlagsReq" );
-// Set parameters for UICC_APPL_CMD_REQ message
+return UiccApplCmdReq(
-TUiccWriteTransparent params;
+ETrIdReadDynamicFlags,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdReadDynamicFlags;
+0,
-params.dataOffset = 0;
+0,
-params.dataAmount = 0;
+KElemFileDynFlagsOrange,
-params.fileId = KElemFileDynFlagsOrange;
+UICC_SFI_NOT_PRESENT );
-params.fileIdSfi = UICC_SFI_NOT_PRESENT;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( KOrangeDedicatedFile >> 8 );
-params.filePath.Append( KOrangeDedicatedFile );
-return iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccWriteDynamicFlagsReq
 // Write dynamic flags
 ret = KErrArgument;
 }
 if ( KErrNone == ret )
 {
-// Set parameters for UICC_APPL_CMD_REQ message
+TBuf8<KLineInfoLength> fileData;
-TUiccWriteTransparent params;
+fileData.Append( line );
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+ret = UiccApplCmdReq(
-params.trId = ETrIdWriteDynamicFlags;
+ETrIdWriteDynamicFlags,
-params.dataOffset = 0;
+UICC_APPL_UPDATE_TRANSPARENT,
-params.fileId = KElemFileDynFlagsOrange;
+0,
-params.fileIdSfi = UICC_SFI_NOT_PRESENT;
+0,
-params.serviceType = UICC_APPL_UPDATE_TRANSPARENT;
+KElemFileDynFlagsOrange,
+UICC_SFI_NOT_PRESENT,
-// File id path
+fileData);
-params.filePath.Append( KMasterFileId >> 8 );
+}
-params.filePath.Append( KMasterFileId );
+// No else
-params.filePath.Append( KOrangeDedicatedFile >> 8 );
-params.filePath.Append( KOrangeDedicatedFile );
-params.fileData.Append( line );
-ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
-}
 return ret;
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccReadDynamicFlagsResp
 RMobilePhone::TMobilePhoneALSLine alsLine
 ( RMobilePhone::EAlternateLineUnknown );
 TInt ret( KErrNone );
-if ( UICC_STATUS_OK == aStatus )
+if ( UICC_STATUS_OK == aStatus && ( 0 < aFileData.Length() ) )
 {
-// Dynamic flags byte: if bit 0 is 1, it is line 1, else line 2
+// Dynamic flags byte
 if ( aFileData[0] & 0x1 )
 {
 alsLine = RMobilePhone::EAlternateLinePrimary;
 }
 else
 TInt CMmPhoneMessHandler::UiccCspFileReq()
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccCspFileReq");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILEREQ, "CMmPhoneMessHandler::UiccCspFileReq" );
-// Set parameters for UICC_APPL_CMD_REQ message
+return UiccApplCmdReq(
-TUiccReadTransparent params;
+ETrIdReadCsp,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdReadCsp;
+18,
-params.dataAmount = 18;
+0,
-params.dataOffset = 0; // Read from first byte
+KElemFileCustomerServiceProfile,
-params.fileId = KElemFileCustomerServiceProfile;
+UICC_SFI_NOT_PRESENT );
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-return iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccCspFileResp
 // Complete CSP
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccHandleCallFwdFlagsResp");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILERESP, "CMmPhoneMessHandler::UiccCspFileResp" );
 RMobilePhone::TMobilePhoneCspFileV1 cspFileEtel;
-if ( aStatus == KErrNone )
+if ( aStatus == KErrNone && ( KCpsLength <= aFileData.Length() ) )
 {
 TUint8 i( 0 );
 // Call offering capabilities
 if ( KUiccCspCallOfferingCode == aFileData[i++] )
 {
 // Value added services capabilities
 if ( KUiccCspValueAddedServicesCode == aFileData[i++] )
 {
 cspFileEtel.iValueAddedServices = aFileData[i++];
 }
-} // End of if ( aStatus == KErrNone )
+} // End of if
 else
 {
 aStatus = KErrNotFound;
 }
-// Complete with CSP data and error code
 CMmDataPackage dataPackage;
 dataPackage.PackData( &cspFileEtel );
 iMessageRouter->Complete(
 EMobilePhoneGetCustomerServiceProfile,
 TInt CMmPhoneMessHandler::UiccImsiReq( )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccImsiReq");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIREQ, "CMmPhoneMessHandler::UiccImsiReq" );
-// Set parameters for UICC_APPL_CMD_REQ message
+return UiccApplCmdReq(
-TUiccReadTransparent params;
+ETrIdReadImsi,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdReadImsi;
+9,
-params.dataAmount = 9; // Length + IMSI = 9 bytes
+0,
-params.dataOffset = 0; // Read from first byte
+KElemFileImsi,
-params.fileId = KElemFileImsi;
+7 );
-params.fileIdSfi = 7;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-return iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccImsiResp
 // Complete IMSI
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccImsiResp" );
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIRESP, "CMmPhoneMessHandler::UiccImsiResp" );
 TInt err( KErrNone );
 TBuf8<RMobilePhone::KIMSISize> imsiData;
-if ( UICC_STATUS_OK == aStatus )
-{
+if ( ( UICC_STATUS_OK == aStatus ) &&
-TUint8 i( 0 );
+( KImsiSize == aFileData.Length() ) )
-TUint8 valueMSB( 0 );
+{
-TUint8 valueLSB( 0 );
+// 1st digit of the buffer is byte count (see 3GPP TS 51.011
-// Get length of IMSI (the first byte)
+// 10.3.2 EFIMSI (IMSI)). Get first IMSI number from second byte higher
-TUint8 lengthOfImsi( aFileData[0] );
+// nibbles. Lower part has parity information and it is ignored.
-// Get the first IMSI number: MSB semioctet of byte 2
+imsiData.AppendNum(
-valueMSB = static_cast<TUint8>( aFileData[1] >> 4 );
+( ( aFileData[KFirstImsiDigit]>> KNibbleShift )&KNibbleMask ),
-// Check the validity
+EDecimal );
-if ( KImsiSize >= lengthOfImsi && 10 > valueMSB  )
-{
+for( TUint8 i = KSecondImsiDigit;
-imsiData.AppendNum( valueMSB, EDecimal);
+i <= aFileData[KImsiStringByteCount];
-}
+i++ )
-else
+{
-{
+// Unused nibbles are set to 'F' so pack only valid digits.
-err = KErrCorrupt;
+if ( KUnusedNibble != aFileData[i]&KNibbleMask )
-}
+{
+imsiData.AppendNum( ( ( aFileData[i]&KNibbleMask ) ), EDecimal );
-if ( KErrNone == err )
+}
-{
+else
-// Check and append the rest of IMSI numbers
+{
-for ( i = 2; i <= lengthOfImsi; i++ )
+// Last digit found.
-{
+break;
-valueLSB = static_cast<TUint8>( aFileData[i] & 0x0F );
+}
-valueMSB = static_cast<TUint8>( aFileData[i] >> 4 );
+if ( KUnusedNibble != ( ( aFileData[i]>>KNibbleShift )&KNibbleMask ) )
+{
-// If both values are valid
+imsiData.AppendNum(
-if ( 10 > valueLSB && 10 > valueMSB )
+( ( aFileData[i]>>KNibbleShift )&KNibbleMask ),
-{
+EDecimal );
-imsiData.AppendNum( valueLSB, EDecimal);
+}
-imsiData.AppendNum( valueMSB, EDecimal);
+else
-}
+{
-// Last nibble is unused
+// Last digit found.
-else if( 10 > valueLSB && 0xF == valueMSB )
+break;
-{
+}
-imsiData.AppendNum( valueLSB, EDecimal);
+}
-break;
+err = KErrNone;
-}
-// Either is invalid
-else
-{
-err = KErrCorrupt;
-break;
-}
-}
-}
 }
 else
 {
 err = KErrNotFound;
 }
-// Complete with packed parameter
 CMmDataPackage dataPackage;
 dataPackage.PackData( &imsiData );
 iMessageRouter->Complete(
 EMobilePhoneGetSubscriberId,
 TInt CMmPhoneMessHandler::UiccReadServiceProviderName()
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadServiceProviderName");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAME, "CMmPhoneMessHandler::UiccReadServiceProviderName" );
-// Read SIM file '6F46', Service Provider Name
+return UiccApplCmdReq(
-// Set parameters for UICC_APPL_CMD_REQ message
+ETrIdReadServiceProviderName,
-TUiccReadTransparent params;
+UICC_APPL_READ_TRANSPARENT,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+17,
-params.trId = ETrIdReadServiceProviderName;
+0,
-// Read all 17 bytes
+KElemFileServiceProviderName,
-params.dataAmount = 17;
+UICC_SFI_NOT_PRESENT );
-params.dataOffset = 0;
-params.fileId = KElemFileServiceProviderName;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-return iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccReadServiceProviderNameResp
 // Complete service provider name
 const TDesC8& aFileData )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadServiceProviderNameResp");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAMERESP, "CMmPhoneMessHandler::UiccReadServiceProviderNameResp" );
-TInt ret( KErrNone );
+TInt ret( KErrNotFound );
-if ( KErrNone == aStatus )
+if ( KErrNone == aStatus && ( KSpnLength == aFileData.Length() ) )
 {
 // Store data and read SPN display info
 ret = UiccProcessServiceTypeCheck( aFileData );
 }
 const TDesC8& aFileData )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccProcessServiceTypeCheck");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCPROCESSSERVICETYPECHECK, "CMmPhoneMessHandler::UiccProcessServiceTypeCheck" );
-// Copy service provider name, starting from byte 2
 TBuf8<KSpnFileSize> spnBuffer( aFileData.Mid( 1 ) );
 TBuf8<KServiceProviderSize> spnOutputBuffer;
 CMmStaticUtility::ConvertGsmDataToUcs2(
 spnBuffer,
 KSpnFileSize,
 if ( 0 == ( displayCondition & 0x02 ) )
 {
 iSecondDisplayCondition = RMobilePhone::KDisplaySPNRequired;
 }
-// PLMN and SPN control information summed up to iDisplayReq field
 iServiceProviderName.iDisplayReq =
 iServiceProviderName.iDisplayReq + iSecondDisplayCondition;
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccProcessServiceTypeCheck - display condition: %d", (TUint8)iServiceProviderName.iDisplayReq);
-// Buffer for service provider name
 TBuf16<KSpnFileSize> tempBuf;
 TIsiUtility::CopyFromBigEndian( spnOutputBuffer, tempBuf );
 // Copy service provider name
 iServiceProviderName.iSPName.Copy( tempBuf );
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccProcessServiceTypeCheck - SPN Name: %S", &iServiceProviderName.iSPName);
 // We still need to get the PLMN list to complete the information.
 // Read the SIM file EF SPDI ('6FCD')
-// Set parameters for UICC_APPL_CMD_REQ message
+return UiccApplCmdReq(
-TUiccReadTransparent params;
+ETrIdReadServiceProviderDisplayInfo,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdReadServiceProviderDisplayInfo;
+0,
-// Read all the data
+0,
-params.dataAmount = 0;
+KElemFileServiceProviderDisplayInfo,
-params.dataOffset = 0;
+0x1B );
-params.fileId = KElemFileServiceProviderDisplayInfo;
-params.fileIdSfi = 0x1B;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-return iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccProcessSpnNameInfo
 // Processes SPN name info response
 if ( KErrNone == aStatus )
 {
 TInt lengthOfLengthInBytes( 0 );
 // Display info is coded in TLV format in USIM.
-// Check the tag
 if ( 0xA3 == aFileData[i] )
 {
 i++;
 // If bit8 is set, rest of bits tell the number of bytes used for
 // length
 lengthOfLengthInBytes = aFileData[i] & 0x7F;
 i += lengthOfLengthInBytes;
 }
 i++;
-// Check the tag
 if ( 0x80 == aFileData[i] )
 {
 // Check how many bytes are used for length field
 i++;
 if ( 0 ==  ( aFileData[i] & 0x80 ) )
 }
 // Copy PLMNs and complete
 if ( KErrNone == aStatus )
 {
-// Number of PLMNs cannot exceed 170
 if ( 170 < numOfPlmns )
 {
 numOfPlmns = 170;
 }
-// At first append number of PLMNs and second display condition
 TUint16 word( static_cast<TUint16>(
 numOfPlmns << 8 | iSecondDisplayCondition ) );
 iServiceProviderName.iPLMNField.Append( word );
-// Copy PLMNs to 16 bit buffer
 for ( TUint8 j( 0 ); j < lengthOfDataInBytes / 2; j++, i += 2 )
 {
 // PLMN entries are copied to 16-bit buffer as follows:
 // 1st byte to 8 LSB bits of 16-bit buffer
 // 2nd byte to 8 MSB bits of 16-bit buffer
 word = static_cast<TUint16>(
 ( aFileData[i+1] << 8 ) | aFileData[i] );
 iServiceProviderName.iPLMNField.Append( word );
 }
-// Last word is added
 iServiceProviderName.iPLMNField.Append( ( 0xFF << 8 ) | aFileData[i] );
-// Complete SPN info
 CMmDataPackage dataPackage;
 dataPackage.PackData( &iServiceProviderName );
 iMessageRouter->Complete(
 EMobilePhoneGetServiceProviderName,
 &dataPackage,
 KErrNone );
 }
-else // Complete error without data
+else
 {
 iMessageRouter->Complete(
 EMobilePhoneGetServiceProviderName,
 KErrNotFound );
 }
-// Reset iServiceProviderName for next time.
 iServiceProviderName.iSPName.Zero();
 iServiceProviderName.iPLMNField.Zero();
 }
 // --------------------------------------------------------------------------
 }
 // If NTSY or CTSY cacheing is ongoing, message is not sent
 if ( ! iCommonTSYRefreshPending && ! iInternalRefreshFiles )
 {
-if ( iRefreshError ) // Some cacheing was failed, set error status
+if ( iRefreshError ) // Some cacheing was failed
 {
 aStatus = UICC_REFRESH_NOT_OK;
 }
 TIsiSend isiMsg( iPhoNetSender->SendBufferDes() );
 0 ); // No subblocks
 ret = iPhoNetSender->Send( isiMsg.Complete() );
 iRefreshError = EFalse;
-// When NTSY/CTSY refresh was performed, set iCompleteRefresfDone flag
+// When NTSY/CTSY refresh was performed
-// that IPC EMmTsySimRefreshDoneIPC will be completed to CTSY
+// IPC EMmTsySimRefreshDoneIPC will be completed to CTSY
 if ( UICC_REFRESH_DONE == aStatus || UICC_REFRESH_NOT_OK == aStatus )
 {
 iCompleteRefresfDone = ETrue;
 }
 }
 OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: APN refresh" );
 iMessageRouter->Complete(
 EMobilePhoneNotifyAPNListChanged,
 KErrNone );
-// Clear and delete cache
 if ( iAPNList )
 {
 iAPNList->Reset();
 delete iAPNList;
 iAPNList = NULL;
 // responsible of making phonebook initialization. => No need for
 // internal initialization.
 if ( !( refreshFiles & KCacheAdn )
 && !( refreshFiles & KCacheFdn ) )
 {
-// Creating buffer for phonebook's name
 TName phonebookName;
 phonebookName.Copy( KInternalPhoneBookType );
 CPhoneBookDataPackage package;
 package.SetPhoneBookName( phonebookName );
 iCommonTSYRefreshPending = ETrue;
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::HandleUiccRefresh: CommonTSY Refresh Pending = %d", iCommonTSYRefreshPending );
 OstTrace1( TRACE_NORMAL, DUP15_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh;iCommonTSYRefreshPending=%d", iCommonTSYRefreshPending );
-// Packed parameter: List of files needed to be refreshed.
 CMmDataPackage dataPackage;
 dataPackage.PackData( &refreshFiles );
 // Complete. This will start the cache update process.
 iMessageRouter->Complete(
 EMmTsySimRefreshNowIPC,
 &dataPackage,
 KErrNone );
 }
-// Send refresh done to UICC only if there's no CTSY/NTSY
-// caching ongoing.
 if ( ! iCommonTSYRefreshPending && ! iInternalRefreshFiles )
 {
 UiccRefreshReq( UICC_REFRESH_DONE );
 }
 }
 TInt ret( KErrNone );
 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() &&
 iMmUiccMessHandler->GetServiceStatus( KServiceAcl ) )
 {
-// Set parameters for UICC_APPL_CMD_REQ message
+ret = UiccApplCmdReq(
-TUiccReadTransparent params;
+ETrIdAclStatusReadEfEst,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdAclStatusReadEfEst;
+0,
-params.dataAmount = 0;
+0,
-params.dataOffset = 0;
+KElemEst,
-params.fileId = KElemEst;
+5 );
-params.fileIdSfi = 0x05;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadEfEstReq: card type is NOT UICC or ACL not supported in EFust");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADEFESTREQ, "CMmPhoneMessHandler::UiccReadEfEstReq: card type is NOT UICC or ACL not supported in EFust" );
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp" );
 TInt ret( KErrNone );
 RMobilePhone::TAPNControlListServiceStatus aclStatus;
-if( UICC_STATUS_OK == aStatus )
+if( ( UICC_STATUS_OK == aStatus ) && ( 0 < aFileData.Length() ) )
 {
 TUint8 aclState( aFileData[0] & KAclStateMask );
 if( aclState )
 {
 aclStatus = RMobilePhone::EAPNControlListServiceEnabled;
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus);
 OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus );
 ret = KErrAccessDenied;
 }
-// complete with packed parameter
 CMmDataPackage dataPackage;
 if( KErrNone == ret )
 {
 dataPackage.PackData( &aclStatus );
 }
-iACLIsProgress = EFalse; //set ACL flag
+iACLIsProgress = EFalse;
 iMessageRouter->Complete(
 EMobilePhoneGetAPNControlListServiceStatus,
 &dataPackage,
 ret );
 }
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp" );
 TInt ret( KErrNone );
 TBool completeNeeded( ETrue );
+TUint8 aclState( 0 );
-if( UICC_STATUS_OK == aStatus )
-{
+if ( 0 < aFileData.Length() )
-TUint8 aclState( aFileData[0] );
+{
-if( aclState & KAclStateMask )
+aclState = aFileData[0];
-{
+}
-if( RMobilePhone::EAPNControlListServiceDisabled == iAclStatus )
-{
+if ( ( UICC_STATUS_OK == aStatus ) && ( aclState & KAclStateMask ) )
-// ACL state is enabled and we need to set it to disabled .
+{
-// So EFest needs to be updated
+if ( RMobilePhone::EAPNControlListServiceDisabled == iAclStatus )
-completeNeeded = EFalse;
+{
-UiccSetAclStatusWriteEfEstReq( aclState );
+// ACL state is enabled and we need to set it to disabled.
-}
+// So EFest needs to be updated
-else
+completeNeeded = EFalse;
-{
+UiccSetAclStatusWriteEfEstReq( aclState );
-// ACL status already correct, let's complete
+}
+else
+{
+// ACL status already correct, let's complete
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" );
 }
+}
+else if ( ( UICC_STATUS_OK == aStatus ) && ( ! aclState & KAclStateMask ) )
+{
+if ( RMobilePhone::EAPNControlListServiceEnabled == iAclStatus )
+{
+// EFest needs to be updated
+completeNeeded = EFalse;
+UiccSetAclStatusWriteEfEstReq( aclState );
 }
 else
 {
-if( RMobilePhone::EAPNControlListServiceEnabled == iAclStatus )
+// ACL status already correct, let's complete
-{
-// EFest needs to be updated
-completeNeeded = EFalse;
-UiccSetAclStatusWriteEfEstReq( aclState );
-}
-else
-{
-// ACL status already correct, let's complete
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete");
 OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" );
-}
 }
 }
 else
 {
 // EFest reading failed
 ret = KErrAccessDenied;
 }
 if( completeNeeded )
 {
-// set flag and complete
+iACLIsProgress = EFalse;
-iACLIsProgress = EFalse; //set ACL flag
 iMessageRouter->Complete(
 EMobilePhoneSetAPNControlListServiceStatus,
 ret );
 }
 }
 // ----------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq
 // Writes ACL status to EFest
 // ----------------------------------------------------------------------------
 //
-TInt CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq(  TUint8 aOldAclState )
+TInt CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq( TUint8 aOldAclState )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq" );
 TInt ret( KErrNone );
 }
 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() &&
 iMmUiccMessHandler->GetServiceStatus( KServiceAcl ) )
 {
-TUiccWriteTransparent params;
+TBuf8<KAclStatusLength> fileData;
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+fileData.Append( newState );
-params.trId = ETrIdAclStatusWriteEfEst;
+ret = UiccApplCmdReq(
-params.dataOffset = 0;
+ETrIdAclStatusWriteEfEst,
-params.dataAmount = 1; // only one byte is update
+UICC_APPL_UPDATE_TRANSPARENT,
-params.fileId = KElemEst;
+0,
-params.fileIdSfi = 0x05;
+0,
-params.serviceType = UICC_APPL_UPDATE_TRANSPARENT;
+KElemEst,
-// File id path
+5,
-params.filePath.Append( KMasterFileId >> 8 );
+fileData );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-params.fileData.Append( newState );
-ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq: card type is NOT UICC or ACL not supported in EFust");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq: card type is NOT UICC or ACL not supported in EFust" );
 TInt ret( KErrNone );
 if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() &&
 iMmUiccMessHandler->GetServiceStatus( KServiceAcl ) )
 {
-// Set parameters for UICC_APPL_CMD_REQ message
+ret = UiccApplCmdReq(
-TUiccReadTransparent params;
+ETrIdAclReadEfAcl,
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+UICC_APPL_READ_TRANSPARENT,
-params.trId = ETrIdAclReadEfAcl;
+0,
-params.dataAmount = 0;
+0,
-params.dataOffset = 0;
+KElemFileAcl,
-params.fileId = KElemFileAcl;
+UICC_SFI_NOT_PRESENT );
-params.fileIdSfi = UICC_SFI_NOT_PRESENT;
-params.serviceType = UICC_APPL_READ_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadAclReq: card type is NOT UICC or ACL not supported in EFust");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADACLREQ, "CMmPhoneMessHandler::UiccReadAclReq: card type is NOT UICC or ACL not supported in EFust" );
 const TDesC8& aFileData )
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadAclResp");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADACLRESP, "CMmPhoneMessHandler::UiccReadAclResp" );
 TInt ret( KErrNone );
-if( UICC_STATUS_OK == aStatus )
+if ( ( UICC_STATUS_OK == aStatus ) &&
+( KApnDataIndex < aFileData.Length() ) )
 {
 if( iAPNList )
 {
 delete iAPNList;
 iAPNList = 0;
 ) const
 {
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::DecodeACL. Number of total entries: %d", aTotalEntries);
 OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_DECODEACL, "CMmPhoneMessHandler::DecodeACL. Number of total entries: %d", aTotalEntries );
-// allocate new array, 1 is granularity
 CDesC8ArrayFlat* apnList = new( ELeave ) CDesC8ArrayFlat( 1 );
 CleanupStack::PushL( apnList );
 TInt offset( 0 );
-//check length before using
 if ( 0 < aTlv.Length() )
 {
 // decode TLV entries to CDesC8ArrayFlat
 for ( TInt i = 0; i < aTotalEntries; i++ )
 {
 {
 TInt indexCount( iAPNList->MdcaCount() );
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::CompleteEnumerateAPNEntries. Number of APN's: %d",indexCount);
 OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_COMPLETEENUMERATEAPNENTRIES, "CMmPhoneMessHandler::CompleteEnumerateAPNEntries. Number of APN's: %d", indexCount );
-//package index of TLV's to the client
 CMmDataPackage dataPackage;
 dataPackage.PackData( &indexCount );
-// set flag and complete
+iACLIsProgress = EFalse;
-iACLIsProgress = EFalse; //set ACL flag
 iMessageRouter->Complete(
 EMobilePhoneEnumerateAPNEntries,
 &dataPackage,
 KErrNone );
 }
 CMmDataPackage dataPackage;
 RMobilePhone::TAPNEntryV3 aclEntry;
 TInt err( KErrNone );
-//check if index is valid or not.
 if ( iAPNList->MdcaCount() <= aIndex )
 {
 err = KErrOverflow;
 }
 else
 aclEntry.iApn.Copy( iAPNList->MdcaPoint( aIndex ) );
 }
 dataPackage.PackData( &aclEntry );
-// set flag and complete
+iACLIsProgress = EFalse;
-iACLIsProgress = EFalse; //set ACL flag
 iMessageRouter->Complete( EMobilePhoneGetAPNname, &dataPackage, err );
 }
 // --------------------------------------------------------------------------
 // CMmPhoneMessHandler::UiccDeleteApnEntry
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccDeleteApnEntry ");
 OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCDELETEAPNENTRY, "CMmPhoneMessHandler::UiccDeleteApnEntry" );
 TInt ret;
-//check if aIndex is valid or not.
 if ( iAPNList->MdcaCount() <= aIndex )
 {
-//error occurs
 ret = KErrOverflow;
 }
 else
 {
-//data is valid
-//delete data from cache
 iAPNList->Delete( aIndex );
 iAPNList->Compress();
 //write new list to the SIM
 ret = UiccWriteEfAclReq();
 iMmUiccMessHandler->GetServiceStatus( KServiceAcl ) )
 {
 TInt dataLen( ACLLength( iAPNList ) );
 TUint8 apnCount( iAPNList->MdcaCount() );
-TUiccWriteTransparent params;
+TBuf8<KFileDataLength> fileData;
-params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+fileData.Append( apnCount );
-params.trId = ETrIdAclWriteEfAcl;
-params.dataOffset = 0;
-params.dataAmount = dataLen;
-params.fileId = KElemFileAcl;
-params.fileIdSfi = UICC_SFI_NOT_PRESENT;
-params.serviceType = UICC_APPL_UPDATE_TRANSPARENT;
-// File id path
-params.filePath.Append( KMasterFileId >> 8 );
-params.filePath.Append( KMasterFileId );
-params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
-params.fileData.Append( apnCount );
 for ( TInt i = 0; i < apnCount; i++ )
 {
 TPtrC8 apn = iAPNList->MdcaPoint( i );
 // spec: The tag value of the APN-TLV shall be 'DD'
-params.fileData.Append( 0xdd );
+fileData.Append( 0xdd );
-params.fileData.Append( apn.Length() );
+fileData.Append( apn.Length() );
-params.fileData.Append( apn );
+fileData.Append( apn );
 }
-ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
+ret = UiccApplCmdReq(
+ETrIdAclWriteEfAcl,
+UICC_APPL_UPDATE_TRANSPARENT,
+0,
+0,
+KElemFileAcl,
+UICC_SFI_NOT_PRESENT,
+fileData );
 }
 else
 {
 TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccWriteEfAclReq: card type is NOT UICC or ACL not supported in EFust");
 OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLREQ, "CMmPhoneMessHandler::UiccWriteEfAclReq: card type is NOT UICC or ACL not supported in EFust" );
 OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLRESP, "CMmPhoneMessHandler::UiccWriteEfAclResp: EFacl writing failed: 0x%x", aStatus );
 ret = KErrAccessDenied;
 }
-iACLIsProgress = EFalse; //set ACL flag
+iACLIsProgress = EFalse;
 iMessageRouter->Complete(
 iOngoingAclIpc,
 ret );
 }
 TFLOGSTRING2("TSY: CMmPhoneMessHandler::ACLLength. Count: %d", aApnList->MdcaCount());
 OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_ACLLENGTH, "CMmPhoneMessHandler::ACLLength. Count: %d", aApnList->MdcaCount() );
 TUint16 length( 0 );
-for ( TInt i = 0; i < aApnList->MdcaCount(); i++ )
+if ( aApnList )
 {
-TPtrC8 apn = aApnList->MdcaPoint( i );
+for ( TInt i = 0; i < aApnList->MdcaCount(); i++ )
-length += apn.Length() + 2;
+{
+TPtrC8 apn = aApnList->MdcaPoint( i );
+length += apn.Length() + 2;
+}
 }
 // result is incremented by one because of EFacl contains number of tlv objects
 // as first byte of the file data
 length++;
 OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_ACLLENGTH, "CMmPhoneMessHandler::ACLLength. ACL len: %d", length );
 return length;
 }
+// --------------------------------------------------------------------------
+// CMmPhoneMessHandler::UiccApplCmdReq
+//
+// --------------------------------------------------------------------------
+//
+TInt CMmPhoneMessHandler::UiccApplCmdReq(
+const TUiccTrId aTrId,
+const TUint8 aServiceType,
+const TUint16 aDataAmount,
+const TUint16 aDataOffset,
+const TUint16 aFileId,
+const TUint8 aFileIdSfi,
+const TDesC8& aFileData )
+{
+TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccApplCmdReq");
+OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCAPPLCMDREQ, "CMmPhoneMessHandler::UiccApplCmdReq" );
+TInt ret( KErrNone );
+TBuf8<KFilePathLength> filePath;
+filePath.Append( KMasterFileId >> 8 );
+filePath.Append( KMasterFileId );
+if ( KElemFileDynFlagsOrange == aFileId )
+{
+filePath.Append( KOrangeDedicatedFile >> 8 );
+filePath.Append( KOrangeDedicatedFile );
+}
+else
+{
+filePath.Append( iMmUiccMessHandler->GetApplicationFileId() );
+}
+if ( UICC_APPL_READ_TRANSPARENT == aServiceType )
+{
+TUiccReadTransparent params;
+params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+params.trId = aTrId;
+params.dataAmount = aDataAmount;
+params.dataOffset = aDataOffset;
+params.fileId = aFileId;
+params.fileIdSfi = aFileIdSfi;
+params.serviceType = aServiceType;
+params.filePath.Append( filePath );
+ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
+}
+else if ( UICC_APPL_UPDATE_TRANSPARENT == aServiceType )
+{
+TUiccWriteTransparent params;
+params.messHandlerPtr = static_cast<MUiccOperationBase*>( this );
+params.trId = aTrId;
+params.dataAmount = aDataAmount;
+params.dataOffset = aDataOffset;
+params.fileId = aFileId;
+params.fileIdSfi = aFileIdSfi;
+params.serviceType = aServiceType;
+params.fileData.Append( aFileData );
+params.filePath.Append( filePath );
+ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params );
+}
+// No else
+return ret;
+}
 // End of file

changeset 8	6295dc2169f3
parent 5	8ccc39f9d787
child 9	8486d82aef45