equal
deleted
inserted
replaced
1545 aCompo.SetStatusNode(EDelivered_InstallProgress); |
1545 aCompo.SetStatusNode(EDelivered_InstallProgress); |
1546 TRAP(err,InstallL( aCompo,wait->iStatus )); |
1546 TRAP(err,InstallL( aCompo,wait->iStatus )); |
1547 if (err != KErrNone) |
1547 if (err != KErrNone) |
1548 { |
1548 { |
1549 aCompo.SetStatusNode(EDelivered_InstalledFailedWithData); |
1549 aCompo.SetStatusNode(EDelivered_InstalledFailedWithData); |
|
1550 delete wait; |
1550 User::Leave(err); |
1551 User::Leave(err); |
1551 } |
1552 } |
1552 wait->StartWait(); |
1553 wait->StartWait(); |
1553 if (!CApplicationManagementUtility::iSilentSession && CApplicationManagementUtility::mCurrDlg) |
1554 if (!CApplicationManagementUtility::iSilentSession && CApplicationManagementUtility::mCurrDlg) |
1554 m_Dlg->closeAMWaitDialog(); |
1555 m_Dlg->closeAMWaitDialog(); |
1555 m_Window->lower(); |
1556 m_Window->lower(); |
1556 TRequestStatus s1 = wait->iStatus; |
1557 TRequestStatus s1 = wait->iStatus; |
1557 delete wait; |
1558 |
1558 RDEBUG_2( "ApplicationManagementSession: JavaInstallL 1 failed with code %d", |
1559 RDEBUG_2( "ApplicationManagementSession: JavaInstallL 1 failed with code %d", |
1559 s1.Int() ); |
1560 s1.Int() ); |
1560 |
1561 |
1561 TInt usifdeplid = -1; |
1562 TInt usifdeplid = -1; |
1562 if (iResults && wait->iStatus.Int()!=KErrCancel) |
1563 if (iResults && wait->iStatus.Int()!=KErrCancel) |
1646 TInt err(KErrNone); |
1647 TInt err(KErrNone); |
1647 TRAP(err,InstallL( aCompo,wait->iStatus )); |
1648 TRAP(err,InstallL( aCompo,wait->iStatus )); |
1648 if (err != KErrNone) |
1649 if (err != KErrNone) |
1649 { |
1650 { |
1650 aCompo.SetStatusNode(EDelivered_InstalledFailedWithData); |
1651 aCompo.SetStatusNode(EDelivered_InstalledFailedWithData); |
|
1652 delete wait; |
1651 User::Leave(err); |
1653 User::Leave(err); |
1652 } |
1654 } |
1653 RDEBUG_2("ApplicationManagementSession: SisInstallL failed with code before startwait %d", |
1655 RDEBUG_2("ApplicationManagementSession: SisInstallL failed with code before startwait %d", |
1654 wait->iStatus.Int() ); |
1656 wait->iStatus.Int() ); |
1655 wait->StartWait(); |
1657 wait->StartWait(); |