am 78d3c602: am b915c3c0: Merge "Skip security check when account id is unknown." into froyo

Merge commit '78d3c6022ccf87566261faf694ff506a68ec6b6f' into kraken

* commit '78d3c6022ccf87566261faf694ff506a68ec6b6f':
  Skip security check when account id is unknown.
This commit is contained in:
Andy Stadler 2010-04-28 09:43:18 -07:00 committed by Android Git Automerger
commit 656d89d67f

View File

@ -1091,7 +1091,7 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
@Override @Override
protected Long doInBackground(Void... params) { protected Long doInBackground(Void... params) {
// Quick check that account is not in security hold // Quick check that account is not in security hold
if (isSecurityHold(mAccountId)) { if (mAccountId != -1 && isSecurityHold(mAccountId)) {
showSecurityActivity = true; showSecurityActivity = true;
return Long.valueOf(-1); return Long.valueOf(-1);
} }