equal
deleted
inserted
replaced
413 CHWRMPower::TBatteryChargingStatus chargingStatus; |
413 CHWRMPower::TBatteryChargingStatus chargingStatus; |
414 |
414 |
415 err = DoGetBatteryChargingStatus(chargingStatus); |
415 err = DoGetBatteryChargingStatus(chargingStatus); |
416 |
416 |
417 if((err != KErrNone) || |
417 if((err != KErrNone) || |
418 (chargingStatus == CHWRMPower::EChargingStatusError) || |
418 (chargingStatus <= CHWRMPower::EChargingStatusError) || |
419 (chargingStatus == CHWRMPower::EChargingStatusNotConnected) || |
419 (chargingStatus == CHWRMPower::EChargingStatusNotConnected) || |
420 (chargingStatus == CHWRMPower::EChargingStatusNotCharging)) |
420 (chargingStatus == CHWRMPower::EChargingStatusNotCharging)) |
421 { |
421 { |
422 err = KErrNotReady; |
422 err = KErrNotReady; |
423 } |
423 } |
465 CHWRMPower::TBatteryChargingStatus chargingStatus; |
465 CHWRMPower::TBatteryChargingStatus chargingStatus; |
466 |
466 |
467 err = DoGetBatteryChargingStatus(chargingStatus); |
467 err = DoGetBatteryChargingStatus(chargingStatus); |
468 |
468 |
469 if((err != KErrNone) || |
469 if((err != KErrNone) || |
470 (chargingStatus == CHWRMPower::EChargingStatusError) || |
470 (chargingStatus <= CHWRMPower::EChargingStatusError) || |
471 (chargingStatus == CHWRMPower::EChargingStatusNotConnected) || |
471 (chargingStatus == CHWRMPower::EChargingStatusNotConnected) || |
472 (chargingStatus == CHWRMPower::EChargingStatusNotCharging)) |
472 (chargingStatus == CHWRMPower::EChargingStatusNotCharging)) |
473 { |
473 { |
474 err = KErrNotReady; |
474 err = KErrNotReady; |
475 } |
475 } |
554 TBool stopchargingNotification(ETrue); |
554 TBool stopchargingNotification(ETrue); |
555 CHWRMPower::TBatteryChargingNotifier cancelNotificationCode; |
555 CHWRMPower::TBatteryChargingNotifier cancelNotificationCode; |
556 |
556 |
557 //Stop charging notifications, if charger is not connected. |
557 //Stop charging notifications, if charger is not connected. |
558 if((aErrCode != KErrNone) || |
558 if((aErrCode != KErrNone) || |
559 (aChrgStatus == CHWRMPower::EChargingStatusError) || |
559 (aChrgStatus <= CHWRMPower::EChargingStatusError) || |
560 (aChrgStatus == CHWRMPower::EChargingStatusNotConnected) || |
560 (aChrgStatus == CHWRMPower::EChargingStatusNotConnected) || |
561 (aChrgStatus == CHWRMPower::EChargingStatusNotCharging)) |
561 (aChrgStatus == CHWRMPower::EChargingStatusNotCharging)) |
562 { |
562 { |
563 cancelNotificationCode = CHWRMPower::EChargingNotifierAll; |
563 cancelNotificationCode = CHWRMPower::EChargingNotifierAll; |
564 } |
564 } |