equal
deleted
inserted
replaced
173 return; |
173 return; |
174 |
174 |
175 case EPreDeleting: |
175 case EPreDeleting: |
176 SendDeleteMsg(status); |
176 SendDeleteMsg(status); |
177 return; |
177 return; |
178 |
178 |
179 default: |
179 default: |
180 //Do nothing. |
180 //Do nothing. |
181 break; |
181 break; |
182 } |
182 } |
183 |
183 |
248 if (!certData->mCanDelete) |
248 if (!certData->mCanDelete) |
249 { |
249 { |
250 User::RequestComplete(pRequestStatus,KErrArgument); |
250 User::RequestComplete(pRequestStatus,KErrArgument); |
251 return; |
251 return; |
252 } |
252 } |
253 |
253 |
254 mState = EPreDeleting; |
254 mState = EPreDeleting; |
255 mTempCertData = certData; |
255 mTempCertData = certData; |
256 HandleDeleteDisableQuery(aStatus, false /* disableCertQuery */); |
256 HandleDeleteDisableQuery(aStatus, false /* disableCertQuery */); |
257 } |
257 } |
258 |
258 |
487 if (!flag) |
487 if (!flag) |
488 { |
488 { |
489 return; |
489 return; |
490 } |
490 } |
491 |
491 |
|
492 TInt err = KErrNone; |
492 if (!certData->mIsDisabled) |
493 if (!certData->mIsDisabled) |
493 { |
494 { |
494 aApplications.Append(KMidletInstallApplicabilityUid); |
495 err = aApplications.Append(KMidletInstallApplicabilityUid); |
495 } |
496 } |
496 |
497 |
497 User::RequestComplete(pRequestStatus,KErrNone); |
498 User::RequestComplete(pRequestStatus, err); |
498 } |
499 } |
499 |
500 |
500 /** |
501 /** |
501 * |
502 * |
502 */ |
503 */ |
833 errTxt.append(java::util::JavaCommonUtils::intToString(err)); |
834 errTxt.append(java::util::JavaCommonUtils::intToString(err)); |
834 ELOG1(EJavaSecurity, "ERROR!!! %s",errTxt.c_str()); |
835 ELOG1(EJavaSecurity, "ERROR!!! %s",errTxt.c_str()); |
835 User::RequestComplete(aRequestStatus,KErrCommsBreak); |
836 User::RequestComplete(aRequestStatus,KErrCommsBreak); |
836 return EFalse; |
837 return EFalse; |
837 } |
838 } |
838 |
839 |
839 return ETrue; |
840 return ETrue; |
840 } |
841 } |
841 |
842 |
842 /** |
843 /** |
843 * |
844 * |
969 { |
970 { |
970 //SendDeleteCommsMsg() operation calls RequestComplete() |
971 //SendDeleteCommsMsg() operation calls RequestComplete() |
971 //operation in the error situation. |
972 //operation in the error situation. |
972 return; |
973 return; |
973 } |
974 } |
974 aCertDataObj.mDeleted = ETrue; |
975 aCertDataObj.mDeleted = ETrue; |
975 |
976 |
976 User::RequestComplete(aRequestStatus,KErrNone); |
977 User::RequestComplete(aRequestStatus,KErrNone); |
977 } |
978 } |
978 |
979 |
979 ///////////////////////////////////////////////////////////////////////////////// |
980 ///////////////////////////////////////////////////////////////////////////////// |