commit ebfe4b08df4e63f2fdd6147c5ce63618e4cfe46a
author Joe Onorato <joeo@android.com> Mon Sep 27 12:08:31 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 27 12:08:31 2010 -0700
tree 4aa94a8e3515a79c3fd5e554eedfd6ee7a82c9a1
parent 3125d9dec8709a6c95039c7b35d27494da46eaab
parent 4a79a04bcd5f8c4d4fab7bcc46eea9e19a3dc63e

am 4a79a04b: When we\'re launching apps, we need to always use startActivitySafely.

Merge commit '4a79a04bcd5f8c4d4fab7bcc46eea9e19a3dc63e'

* commit '4a79a04bcd5f8c4d4fab7bcc46eea9e19a3dc63e':
  When we're launching apps, we need to always use startActivitySafely.

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 019cd7b..0671063 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1473,9 +1473,9 @@
 
             Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY);
             pickIntent.putExtra(Intent.EXTRA_INTENT, mainIntent);
-            startActivityForResult(pickIntent, REQUEST_PICK_APPLICATION);
+            startActivityForResultSafely(pickIntent, REQUEST_PICK_APPLICATION);
         } else {
-            startActivityForResult(intent, REQUEST_CREATE_SHORTCUT);
+            startActivityForResultSafely(intent, REQUEST_CREATE_SHORTCUT);
         }
     }
 
@@ -1502,7 +1502,7 @@
         if (folderName != null && folderName.equals(shortcutName)) {
             addFolder(mAddScreen, mAddIntersectCellX, mAddIntersectCellY);
         } else {
-            startActivityForResult(intent, REQUEST_CREATE_LIVE_FOLDER);
+            startActivityForResultSafely(intent, REQUEST_CREATE_LIVE_FOLDER);
         }
     }