ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Make sure updatePolicies is always called during provisioning"

This commit is contained in:
Marc Blank 2010-10-08 16:27:21 -07:00 committed by Android (Google) Code Review
parent 6993130a7c 0215d739d5
commit 30c99e0dc3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/exchange/EasSyncService.java
View File

@ -1386,9 +1386,9 @@ public class EasSyncService extends AbstractSyncService {
PolicySet ps = pp.getPolicySet();
// Update the account with a null policyKey (the key we've gotten is
// temporary and cannot be used for syncing)
if (ps.writeAccount(mAccount, null, true, mContext)) {
sp.updatePolicies(mAccount.mId);
}
ps.writeAccount(mAccount, null, true, mContext);
// Make sure that SecurityPolicy is up-to-date
sp.updatePolicies(mAccount.mId);
if (pp.getRemoteWipe()) {
// We've gotten a remote wipe command
// If we're not the admin, we can't do the wipe, so just return