diff options
author | Adam Cohen <adamcohen@google.com> | 2015-03-27 23:18:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 23:18:30 +0000 |
commit | 5f2a098ef3eecdc1af602582aaf8ff95b280ec28 (patch) | |
tree | a2ed9c596a8f39ee341ad9a38c54788d087926da /src/com/android/launcher3/Launcher.java | |
parent | 4e0a368dffd5bae06abb9063e738b33653799a48 (diff) | |
parent | 173f711e03dfce70d76c3b45f764a4f6b682a3b3 (diff) | |
download | android_packages_apps_Trebuchet-5f2a098ef3eecdc1af602582aaf8ff95b280ec28.tar.gz android_packages_apps_Trebuchet-5f2a098ef3eecdc1af602582aaf8ff95b280ec28.tar.bz2 android_packages_apps_Trebuchet-5f2a098ef3eecdc1af602582aaf8ff95b280ec28.zip |
am 173f711e: Ensure that we capture all paths for starting activity for result
* commit '173f711e03dfce70d76c3b45f764a4f6b682a3b3':
Ensure that we capture all paths for starting activity for result
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 4c5bba9e3..321b15919 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -40,6 +40,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; +import android.content.IntentSender; import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; @@ -2074,10 +2075,26 @@ public class Launcher extends Activity @Override public void startActivityForResult(Intent intent, int requestCode) { + onStartForResult(requestCode); + super.startActivityForResult(intent, requestCode); + } + + @Override + public void startIntentSenderForResult (IntentSender intent, int requestCode, + Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) { + onStartForResult(requestCode); + try { + super.startIntentSenderForResult(intent, requestCode, + fillInIntent, flagsMask, flagsValues, extraFlags, options); + } catch (IntentSender.SendIntentException e) { + throw new ActivityNotFoundException(); + } + } + + private void onStartForResult(int requestCode) { if (requestCode >= 0) { setWaitingForResult(true); } - super.startActivityForResult(intent, requestCode); } /** |