commit 4a79a04bcd5f8c4d4fab7bcc46eea9e19a3dc63e
author Joe Onorato <joeo@android.com> Fri Sep 24 16:17:21 2010 -0700
committer Joe Onorato <joeo@android.com> Mon Sep 27 10:43:16 2010 -0700
tree b1697cf63a04d0e8003b3d36de657b17a8194159
parent edfd2a5605d126ed39df30336e3f0ffe3dd70ce0

When we're launching apps, we need to always use startActivitySafely.

It's possible that the app doesn't implement the component as promised, and the launcher shouldn't
crash.

Bug: 3005141
Change-Id: Ieac51433a467fd12160247bfd281828a69f5f7d2

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 28a6712..bc529a4 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1223,9 +1223,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);
         }
     }
 
@@ -1237,7 +1237,7 @@
         if (folderName != null && folderName.equals(shortcutName)) {
             addFolder();
         } else {
-            startActivityForResult(intent, REQUEST_CREATE_LIVE_FOLDER);
+            startActivityForResultSafely(intent, REQUEST_CREATE_LIVE_FOLDER);
         }
     }