Workaround AccountWithDataSet problems on work profiles
Bug 29417435
Bug 18641067
Change-Id: I31084b0f69a8e56b88610afe6e18d6f01e6cabe9
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 6e2746d..17ba765 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -356,11 +356,16 @@
}
case ContactsRequest.ACTION_PICK_GROUP_MEMBERS: {
- final AccountWithDataSet account = getIntent().getParcelableExtra(
- UiIntentActions.GROUP_ACCOUNT_WITH_DATA_SET);
+ final String accountName = getIntent().getStringExtra(
+ UiIntentActions.GROUP_ACCOUNT_NAME);
+ final String accountType = getIntent().getStringExtra(
+ UiIntentActions.GROUP_ACCOUNT_TYPE);
+ final String accountDataSet = getIntent().getStringExtra(
+ UiIntentActions.GROUP_ACCOUNT_DATA_SET);
final ArrayList<String> contactIds = getIntent().getStringArrayListExtra(
UiIntentActions.GROUP_CONTACT_IDS);
- mListFragment = GroupMemberPickerFragment.newInstance(account, contactIds);
+ mListFragment = GroupMemberPickerFragment.newInstance(
+ accountName, accountType, accountDataSet, contactIds);
break;
}