commit 3580f1c5d39bd2131511bdd7ab6d1e2c6246e53e
author Paul Westbrook <pwestbro@google.com> Tue Apr 03 10:32:12 2012 -0700
committer Paul Westbrook <pwestbro@google.com> Tue Apr 03 12:20:48 2012 -0700
tree 72b891dd39b2a8ab01d3af14ce2b0d4c5c1e0520
parent a1e6fd822fc69837355256772550c9cd807d3c6b

Fix monkey NPE

Bug: 6276597
Change-Id: I6ee03a15e022583d1f03761c6b7b09dc41d49c17

src/com/android/mail/utils/Utils.java

diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index a57b2f2..11d992f 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -703,12 +703,17 @@
      * Show the settings screen for the supplied account.
      */
      public static void showFolderSettings(Context context, Account account, Folder folder) {
-        final Intent settingsIntent = new Intent(Intent.ACTION_EDIT, account.settingsIntentUri);
+         if (account == null || folder == null) {
+             LogUtils.e(LOG_TAG, "Invalid attempt to show folder settings. account: %s folder: %s",
+                     account, folder);
+             return;
+         }
+         final Intent settingsIntent = new Intent(Intent.ACTION_EDIT, account.settingsIntentUri);
 
-        settingsIntent.putExtra(EditSettingsExtras.EXTRA_ACCOUNT, account);
-        settingsIntent.putExtra(EditSettingsExtras.EXTRA_FOLDER, folder);
+         settingsIntent.putExtra(EditSettingsExtras.EXTRA_ACCOUNT, account);
+         settingsIntent.putExtra(EditSettingsExtras.EXTRA_FOLDER, folder);
 
-        context.startActivity(settingsIntent);
+         context.startActivity(settingsIntent);
     }
 
     /**