diff options
author | Joe Onorato <joeo@android.com> | 2010-09-27 12:08:31 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 12:08:31 -0700 |
commit | ebfe4b08df4e63f2fdd6147c5ce63618e4cfe46a (patch) | |
tree | 4aa94a8e3515a79c3fd5e554eedfd6ee7a82c9a1 /src/com/android/launcher2/Launcher.java | |
parent | 3125d9dec8709a6c95039c7b35d27494da46eaab (diff) | |
parent | 4a79a04bcd5f8c4d4fab7bcc46eea9e19a3dc63e (diff) | |
download | android_packages_apps_Trebuchet-ebfe4b08df4e63f2fdd6147c5ce63618e4cfe46a.tar.gz android_packages_apps_Trebuchet-ebfe4b08df4e63f2fdd6147c5ce63618e4cfe46a.tar.bz2 android_packages_apps_Trebuchet-ebfe4b08df4e63f2fdd6147c5ce63618e4cfe46a.zip |
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.
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 019cd7b33..0671063c3 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -1473,9 +1473,9 @@ public final class Launcher extends Activity 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 @@ public final class Launcher extends Activity if (folderName != null && folderName.equals(shortcutName)) { addFolder(mAddScreen, mAddIntersectCellX, mAddIntersectCellY); } else { - startActivityForResult(intent, REQUEST_CREATE_LIVE_FOLDER); + startActivityForResultSafely(intent, REQUEST_CREATE_LIVE_FOLDER); } } |