diff options
author | Raj Yengisetty <rajesh@cyngn.com> | 2015-04-13 14:08:27 -0700 |
---|---|---|
committer | niks255 <niks255@mail.ru> | 2017-01-07 04:39:45 +0600 |
commit | 502a7bf238d4a65414b3285008fb56c90727a957 (patch) | |
tree | c0826e25fde6b36c91ce882bcf8b8b01bea9d909 | |
parent | 5586206b751f24ae9bbb96dbdc779ae98f9f9919 (diff) | |
download | android_packages_apps_Trebuchet-502a7bf238d4a65414b3285008fb56c90727a957.tar.gz android_packages_apps_Trebuchet-502a7bf238d4a65414b3285008fb56c90727a957.tar.bz2 android_packages_apps_Trebuchet-502a7bf238d4a65414b3285008fb56c90727a957.zip |
Trebuchet: Fix NPE when adding widgets
Make sure to setWaitingForResult on startIntentSenderForResult so that
mPendingAddInfo is saved
Repro: Change orientation when in the config activity for a widget
Change-Id: I76ecc2b69b7f4a1cda65a481699aa79ae67f767a
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d9a4419ca..302ed1b7f 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -43,6 +43,7 @@ import android.content.ContentResolver; import android.content.Context; 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; @@ -2603,6 +2604,30 @@ public class Launcher extends Activity } } + /** + * This is used when starting widget config activities. Make sure to set mWaitingForResult so that + * the ItemInfo for the pending item is properly saved. + * + * @param intent + * @param requestCode + * @param fillInIntent + * @param flagsMask + * @param flagsValues + * @param extraFlags + * @param options + * @throws IntentSender.SendIntentException + */ + @Override + public void startIntentSenderForResult(IntentSender intent, int requestCode, + Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags, Bundle options) + throws IntentSender.SendIntentException { + if (requestCode >= 0) { + mWaitingForResult = true; + } + super.startIntentSenderForResult(intent, requestCode, fillInIntent, flagsMask, flagsValues, + extraFlags, options); + } + protected void moveToCustomContentScreen(boolean animate) { // Close any folders that may be open. closeFolder(); |