diff options
author | Gary Mai <garymai@google.com> | 2021-05-13 17:11:35 -0700 |
---|---|---|
committer | Gary Mai <garymai@google.com> | 2021-05-13 17:48:38 -0700 |
commit | e8d612de9fce21b81616446c0933c8fa6f8d2cd0 (patch) | |
tree | f1a27dda7b596275a7560d0880011650c229c1e6 /src | |
parent | 1a4b0cc01b9738939a5173b6016b00860615a1fd (diff) | |
download | ContactsProvider-e8d612de9fce21b81616446c0933c8fa6f8d2cd0.tar.gz |
Move broadcast and return to after finalizing the transactions
Test: unit and Cts tests
Bug: 187969786
Change-Id: I6c1fc9c7e17463a50004a39d370b14d749e8e03d
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 8 |
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(); |