equal
deleted
inserted
replaced
436 TBool isCompleted = EFalse; |
436 TBool isCompleted = EFalse; |
437 AppendMTPExtensionSetsL(isCompleted); |
437 AppendMTPExtensionSetsL(isCompleted); |
438 if (isCompleted) |
438 if (isCompleted) |
439 { |
439 { |
440 Schedule(EEnumerated); |
440 Schedule(EEnumerated); |
|
441 |
441 } |
442 } |
442 else |
443 else |
443 { |
444 { |
444 Schedule(EEnumeratingVendorExtensions); |
445 Schedule(EEnumeratingVendorExtensions); |
445 } |
446 } |
451 SetRequestComplete(*iPendingStatus, KErrNone); |
452 SetRequestComplete(*iPendingStatus, KErrNone); |
452 SetState(EEnumerated); |
453 SetState(EEnumerated); |
453 break; |
454 break; |
454 |
455 |
455 case EEnumerated: |
456 case EEnumerated: |
|
457 { |
|
458 if (iHasPendingRequest) |
|
459 { |
|
460 iHasPendingRequest = EFalse; |
|
461 iSingletons.DpController().ExecutePendingRequestL(); |
|
462 } |
|
463 |
456 if (iCallback) |
464 if (iCallback) |
457 { |
465 { |
458 iCallback->NotifyEnumerationCompleteL(iStorageId, KErrNone); |
466 iCallback->NotifyEnumerationCompleteL(iStorageId, KErrNone); |
459 iCallback = NULL; |
467 iCallback = NULL; |
460 iStorageId = KMTPNotSpecified32; |
468 iStorageId = KMTPNotSpecified32; |
461 } |
469 } |
|
470 } |
462 break; |
471 break; |
463 |
472 |
464 case EEnumeratedBatteryLevel : |
473 case EEnumeratedBatteryLevel : |
465 *iPendingBatteryLevel = iBatteryInfoV1.iChargeLevel; |
474 *iPendingBatteryLevel = iBatteryInfoV1.iChargeLevel; |
466 SetRequestComplete(*iPendingStatus, KErrNone); |
475 SetRequestComplete(*iPendingStatus, KErrNone); |
481 */ |
490 */ |
482 CMTPDeviceDataStore::CMTPDeviceDataStore() : |
491 CMTPDeviceDataStore::CMTPDeviceDataStore() : |
483 CActive(EPriorityStandard), |
492 CActive(EPriorityStandard), |
484 iBatteryInfoV1Pckg(iBatteryInfoV1), |
493 iBatteryInfoV1Pckg(iBatteryInfoV1), |
485 iPhoneIdV1Pckg(iPhoneIdV1), |
494 iPhoneIdV1Pckg(iPhoneIdV1), |
486 iIsConnectMac(EFalse) |
495 iIsConnectMac(EFalse), |
|
496 iHasPendingRequest(EFalse) |
487 { |
497 { |
488 CActiveScheduler::Add(this); |
498 CActiveScheduler::Add(this); |
489 } |
499 } |
490 |
500 |
491 /** |
501 /** |
1233 } |
1243 } |
1234 void CMTPDeviceDataStore::SetConnectMac(TBool aConnectMac) |
1244 void CMTPDeviceDataStore::SetConnectMac(TBool aConnectMac) |
1235 { |
1245 { |
1236 iIsConnectMac = aConnectMac; |
1246 iIsConnectMac = aConnectMac; |
1237 } |
1247 } |
|
1248 |
|
1249 void CMTPDeviceDataStore::RegisterPendingRequest() |
|
1250 { |
|
1251 iHasPendingRequest = ETrue; |
|
1252 } |
|
1253 |
|
1254 |