From 1998a2ee1e27b514bfdaab51e73746805ec8bedf Mon Sep 17 00:00:00 2001
From: James Kung <kingkung@google.com>
Date: Wed, 20 Mar 2013 12:36:48 -0700
Subject: am 95e9538c: Fix for "Fragment already added" exception

* commit '95e9538c2e504ea5528b07e3abdf54bb3d91c88a':
  Fix for "Fragment already added" exception
---
 src/com/android/calendar/EventInfoFragment.java                      | 5 ++++-
 src/com/android/calendar/event/EditEventFragment.java                | 5 ++++-
 .../calendar/selectcalendars/SelectCalendarsSimpleAdapter.java       | 1 +
 .../android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java | 1 +
 .../selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java    | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index 198a9117..e0bc1c24 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -27,6 +27,7 @@ import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.app.Service;
 import android.content.ActivityNotFoundException;
 import android.content.ContentProviderOperation;
@@ -1222,8 +1223,10 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
                     mIsTabletConfig);
             mDialog.setTargetFragment(this, REQUEST_CODE_COLOR_PICKER);
         }
+        final FragmentManager fragmentManager = getFragmentManager();
+        fragmentManager.executePendingTransactions();
         if (!mDialog.isAdded()) {
-            mDialog.show(getFragmentManager(), TAG);
+            mDialog.show(fragmentManager, TAG);
         }
     }
 
diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java
index 220e17cc..b0af28db 100644
--- a/src/com/android/calendar/event/EditEventFragment.java
+++ b/src/com/android/calendar/event/EditEventFragment.java
@@ -19,6 +19,7 @@ package com.android.calendar.event;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Fragment;
+import android.app.FragmentManager;
 import android.content.AsyncQueryHandler;
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
@@ -375,8 +376,10 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor
                 mDialog.setCalendarColor(mModel.mCalendarColor);
                 mDialog.setColors(colors, mModel.mEventColor);
             }
+            final FragmentManager fragmentManager = getFragmentManager();
+            fragmentManager.executePendingTransactions();
             if (!mDialog.isAdded()) {
-                mDialog.show(getFragmentManager(), TAG);
+                mDialog.show(fragmentManager, TAG);
             }
         }
     };
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
index 4a9420b1..c3be8ac4 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSimpleAdapter.java
@@ -240,6 +240,7 @@ public class SelectCalendarsSimpleAdapter extends BaseAdapter implements ListAda
                 } else {
                     mDialog.setCalendarId(mData[position].id);
                 }
+                mFragmentManager.executePendingTransactions();
                 if (!mDialog.isAdded()) {
                     mDialog.show(mFragmentManager, "Fragment");
                 }
diff --git a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
index 67e078b6..4035932f 100644
--- a/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectCalendarsSyncAdapter.java
@@ -182,6 +182,7 @@ public class SelectCalendarsSyncAdapter extends BaseAdapter
                 } else {
                     mDialog.setCalendarId(mData[position].id);
                 }
+                mFragmentManager.executePendingTransactions();
                 if (!mDialog.isAdded()) {
                     mDialog.show(mFragmentManager, TAG);
                 }
diff --git a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java
index 41e1b2e1..e4692319 100644
--- a/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java
+++ b/src/com/android/calendar/selectcalendars/SelectSyncedCalendarsMultiAccountAdapter.java
@@ -334,6 +334,7 @@ public class SelectSyncedCalendarsMultiAccountAdapter extends CursorTreeAdapter
                 } else {
                     mDialog.setCalendarId(id);
                 }
+                mFragmentManager.executePendingTransactions();
                 if (!mDialog.isAdded()) {
                     mDialog.show(mFragmentManager, TAG);
                 }
-- 
cgit v1.2.3