Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of git://codeaurora.org/platform/packages/apps/UnifiedEmail into cm-14.0cm-14.0

"LA.UM.5.5.r1-00900-8x96.0"

4 files changed, 24 insertions, 12 deletions

diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index f61a19b4d..c3c8006cd 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -3751,7 +3751,9 @@ public class ComposeActivity extends ActionBarActivity
                 if (!mAccount.expungeMessageUri.equals(Uri.EMPTY)) {
                     getContentResolver().update(mAccount.expungeMessageUri, values, null, null);
                 } else {
-                    getContentResolver().delete(mDraft.uri, null, null);
+                    if (mDraft.uri != null) {
+                        getContentResolver().delete(mDraft.uri, null, null);
+                    }
                 }
                 // This is not strictly necessary (since we should not try to
                 // save the draft after calling this) but it ensures that if we
diff --git a/src/com/android/mail/ui/AccountFeedbackActivity.java b/src/com/android/mail/ui/AccountFeedbackActivity.java
index 89a736d37..bbcb9f5e4 100644
--- a/src/com/android/mail/ui/AccountFeedbackActivity.java
+++ b/src/com/android/mail/ui/AccountFeedbackActivity.java
@@ -17,14 +17,6 @@
 
 package com.android.mail.ui;
 
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
-import android.view.Menu;
-import android.view.MenuItem;
-
 import com.android.mail.R;
 import com.android.mail.browse.ConversationAccountController;
 import com.android.mail.content.ObjectCursor;
@@ -32,12 +24,20 @@ import com.android.mail.providers.Account;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.utils.Utils;
 
+import android.app.ActionBar;
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
 /**
  * Activity that provides support for querying an {@link Account}
  * as well as showing settings/help/send feedback in the action
  * overflow menu.
  */
-public abstract class AccountFeedbackActivity extends ActionBarActivity
+public abstract class AccountFeedbackActivity extends Activity
         implements ConversationAccountController, AccountLoadCallbacks.AccountLoadCallbackListener {
     public static final String EXTRA_ACCOUNT_URI = "extra-account-uri";
 
@@ -57,7 +57,7 @@ public abstract class AccountFeedbackActivity extends ActionBarActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.account_feedback_activity);
 
-        final ActionBar actionBar = getSupportActionBar();
+        final ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
 
         final Intent intent = getIntent();
diff --git a/src/com/android/mail/ui/FolderSelectionDialog.java b/src/com/android/mail/ui/FolderSelectionDialog.java
index 0e1ea1cd7..ce3a9a7b3 100644
--- a/src/com/android/mail/ui/FolderSelectionDialog.java
+++ b/src/com/android/mail/ui/FolderSelectionDialog.java
@@ -22,6 +22,7 @@ import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.view.View;
 import android.widget.AdapterView;
 
@@ -32,6 +33,7 @@ import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.utils.LogTag;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 
@@ -86,7 +88,13 @@ public abstract class FolderSelectionDialog extends DialogFragment implements On
         mCurrentFolder = args.getParcelable(ARG_FOLDER_TAG);
         mAccount = args.getParcelable(ARG_ACCOUNT_TAG);
         mBatch = args.getBoolean(ARG_BATCH_TAG);
-        mTarget = Arrays.asList((Conversation[])args.getParcelableArray(ARG_TARGET_TAG));
+        mTarget = new ArrayList<>();
+        Parcelable[] temps = args.getParcelableArray(ARG_TARGET_TAG);
+        if(temps != null){
+            for(Parcelable temp:temps){
+                mTarget.add((Conversation) temp);
+            }
+        }
     }
 
     @Override
diff --git a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
index 3cfa8b675..07c7bd1c6 100644
--- a/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
+++ b/src/com/android/mail/ui/MaterialSearchSuggestionsList.java
@@ -143,6 +143,8 @@ public class MaterialSearchSuggestionsList extends LinearLayout
                         result.add(new SuggestionItem(suggestion, iconUri));
                     } while (c.moveToNext());
                 }
+            } catch (IllegalStateException e) {
+                // db could have been closed due to cleanup, simply don't do anything.
             } finally {
                 if (c != null) {
                     c.close();