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

am d40977d1: am 8100a2dc: Server sending unsupported policies will cause NPE

Browse Source 
Merge commit 'd40977d14a355fc4d610f4fd8bcbb6196f5cfc96' into kraken

* commit 'd40977d14a355fc4d610f4fd8bcbb6196f5cfc96':
  Server sending unsupported policies will cause NPE
This commit is contained in:
Marc Blank 2010-05-13 15:36:30 -07:00 committed by Android Git Automerger
commit 1c78324f49
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1286,7 +1286,10 @@ public class EasSyncService extends AbstractSyncService {
// the framework; if so, return the ProvisionParser containing the policy set and // the framework; if so, return the ProvisionParser containing the policy set and
// temporary key // temporary key
PolicySet ps = pp.getPolicySet(); PolicySet ps = pp.getPolicySet();
if (SecurityPolicy.getInstance(mContext).isSupported(ps)) { // The PolicySet can be null if there are policies we don't know about (e.g. ones
// from Exchange 12.1) If we have a PolicySet, then we ask whether the device can
// support the actual parameters of those policies.
if ((ps != null) && SecurityPolicy.getInstance(mContext).isSupported(ps)) {
return pp; return pp;
} }
} }