Merge "Move broadcast and return to after finalizing the transactions" into sc-dev

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index ca6aaad2..4b2b37ae 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -2319,12 +2319,12 @@ public class ContactsProvider2 extends AbstractContactsProvider
             try {
                 mDbHelper.get().createSimAccountIdInTransaction(
                         AccountWithDataSet.get(accountName, accountType, null), simSlot, efType);
-                getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
                 db.setTransactionSuccessful();
-                return response;
             } finally {
                 db.endTransaction();
             }
+            getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
+            return response;
         } else if (SimContacts.REMOVE_SIM_ACCOUNT_METHOD.equals(method)) {
             ContactsPermissions.enforceCallingOrSelfPermission(getContext(),
                     MANAGE_SIM_ACCOUNTS_PERMISSION);
@@ -2338,13 +2338,13 @@ public class ContactsProvider2 extends AbstractContactsProvider
             db.beginTransaction();
             try {
                 mDbHelper.get().removeSimAccounts(simSlot);
-                getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
                 scheduleBackgroundTask(BACKGROUND_TASK_UPDATE_ACCOUNTS);
                 db.setTransactionSuccessful();
-                return response;
             } finally {
                 db.endTransaction();
             }
+            getContext().sendBroadcast(new Intent(SimContacts.ACTION_SIM_ACCOUNTS_CHANGED));
+            return response;
         } else if (SimContacts.QUERY_SIM_ACCOUNTS_METHOD.equals(method)) {
             ContactsPermissions.enforceCallingOrSelfPermission(getContext(), READ_PERMISSION);
             final Bundle response = new Bundle();