diff options
| author | Tony Mantler <nicoya@google.com> | 2014-10-17 16:28:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-17 16:28:39 +0000 |
| commit | 17553ce2afdf3f8be5e53a639ac8f2593e388fec (patch) | |
| tree | a7ef8c99fcd7209bf3ef85309391c0fec837cb45 /src | |
| parent | bd16ec759acbd1acbff33cc08a9c86cc600f9194 (diff) | |
| parent | 46b5b33c4de296b5c3b61b031db9d36bf429be6a (diff) | |
| download | android_packages_apps_UnifiedEmail-17553ce2afdf3f8be5e53a639ac8f2593e388fec.tar.gz android_packages_apps_UnifiedEmail-17553ce2afdf3f8be5e53a639ac8f2593e388fec.tar.bz2 android_packages_apps_UnifiedEmail-17553ce2afdf3f8be5e53a639ac8f2593e388fec.zip | |
Merge "Prevent rare NPE" into ub-gmail-ur14-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/mail/ui/AbstractActivityController.java | 4 | ||||
| -rw-r--r-- | src/com/android/mail/ui/RecentFolderList.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java index ff97f586e..a7de33b60 100644 --- a/src/com/android/mail/ui/AbstractActivityController.java +++ b/src/com/android/mail/ui/AbstractActivityController.java @@ -940,7 +940,9 @@ public abstract class AbstractActivityController implements ActivityController, setListContext(folder, query); showConversationList(mConvListContext); // Touch the current folder: it is different, and it has been accessed. - mRecentFolderList.touchFolder(mFolder, mAccount); + if (mFolder != null) { + mRecentFolderList.touchFolder(mFolder, mAccount); + } } resetActionBarIcon(); } diff --git a/src/com/android/mail/ui/RecentFolderList.java b/src/com/android/mail/ui/RecentFolderList.java index b581aafbe..f2de5892b 100644 --- a/src/com/android/mail/ui/RecentFolderList.java +++ b/src/com/android/mail/ui/RecentFolderList.java @@ -20,6 +20,7 @@ import android.content.ContentValues; import android.content.Context; import android.net.Uri; import android.os.AsyncTask; +import android.support.annotation.NonNull; import com.android.mail.content.ObjectCursor; import com.android.mail.providers.Account; @@ -189,7 +190,7 @@ public final class RecentFolderList { * be called with a null folder. * @param folder the folder we touched */ - public void touchFolder(Folder folder, Account account) { + public void touchFolder(@NonNull Folder folder, Account account) { // We haven't got a valid account yet, cannot proceed. if (mAccount == null || !mAccount.equals(account)) { if (account != null) { @@ -199,7 +200,6 @@ public final class RecentFolderList { return; } } - assert (folder != null); if (folder.isProviderFolder() || folder.isType(FolderType.SEARCH)) { LogUtils.d(TAG, "Not touching recent folder because it's provider or search folder"); |