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

am 17a18d64: Merge "Fix NPE caused by I34451000" into froyo

Browse Source 
Merge commit '17a18d644af54b98087f3ec7a9b1e6d55e604e67' into froyo-plus-aosp

* commit '17a18d644af54b98087f3ec7a9b1e6d55e604e67':
  Fix NPE caused by I34451000
This commit is contained in:
Makoto Onuki 2010-04-10 11:38:05 -07:00 committed by Android Git Automerger
commit aab0d339da
5 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/email/activity/AccountFolderList.java
View File

@ -214,11 +214,9 @@ public class AccountFolderList extends ListActivity implements OnItemClickListen
Utility.cancelTask(mDeleteAccountTask, false); // Don't interrupt if it's running.
mDeleteAccountTask = null;
mListAdapter.changeCursor(null);
mListAdapter = null;
mHandler = null;
mControllerCallback = null;
if (mListAdapter != null) {
mListAdapter.changeCursor(null);
}
}
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

3
src/com/android/email/activity/MailboxList.java
View File

@ -199,9 +199,6 @@ public class MailboxList extends ListActivity implements OnItemClickListener, On
mMessageCountTask = null;
mListAdapter.changeCursor(null);
mListAdapter = null;
mHandler = null;
mControllerCallback = null;
}
public void onClick(View v) {

5
src/com/android/email/activity/MessageCompose.java
View File

@ -396,18 +396,13 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
if (mAddressAdapterTo != null) {
mAddressAdapterTo.changeCursor(null);
mAddressAdapterTo = null;
}
if (mAddressAdapterCc != null) {
mAddressAdapterCc.changeCursor(null);
mAddressAdapterCc = null;
}
if (mAddressAdapterBcc != null) {
mAddressAdapterBcc.changeCursor(null);
mAddressAdapterBcc = null;
}
mHandler = null;
mListener = null;
}
/**

3
src/com/android/email/activity/MessageList.java
View File

@ -328,9 +328,6 @@ public class MessageList extends ListActivity implements OnItemClickListener, On
mSetFooterTask = null;
mListAdapter.changeCursor(null);
mListAdapter = null;
mHandler = null;
mControllerCallback = null;
}
@Override

3
src/com/android/email/activity/MessageView.java
View File

@ -502,9 +502,6 @@ public class MessageView extends Activity implements OnClickListener {
mMessageContentView = null;
}
// the cursor was closed in onPause()
mHandler = null;
mControllerCallback = null;
}
private void onDelete() {