Fix for LMP crash for Fragment.getContext()
Fragment.getContext() was added in API level 23 so changing
usage from getContext() to mContext and adding override to
the fragment just in case.
Bug 30601104
Change-Id: I682cb28b60ca3d4103cb41f34d331ef761cde2f2
diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 7286c46..d8045cf 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -751,6 +751,11 @@
}
@Override
+ public Context getContext() {
+ return getActivity();
+ }
+
+ @Override
public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
inflater.inflate(R.menu.edit_contact, menu);
}
@@ -1477,7 +1482,7 @@
if (saveSucceeded && contactLookupUri != null) {
final Uri lookupUri = maybeConvertToLegacyLookupUri(
mContext, contactLookupUri, mLookupUri);
- resultIntent = ImplicitIntentsUtil.composeQuickContactIntent(getContext(),
+ resultIntent = ImplicitIntentsUtil.composeQuickContactIntent(mContext,
lookupUri, QuickContactActivity.MODE_FULLY_EXPANDED);
resultIntent.putExtra(QuickContactActivity.EXTRA_PREVIOUS_SCREEN_TYPE,
ScreenType.EDITOR);
@@ -1534,7 +1539,7 @@
}
mContactIdForJoin = ContentUris.parseId(contactLookupUri);
- final Intent intent = new Intent(getContext(), ContactSelectionActivity.class);
+ final Intent intent = new Intent(mContext, ContactSelectionActivity.class);
intent.setAction(UiIntentActions.PICK_JOIN_CONTACT_ACTION);
intent.putExtra(UiIntentActions.TARGET_CONTACT_ID_EXTRA_KEY, mContactIdForJoin);
startActivityForResult(intent, REQUEST_CODE_JOIN);