commit ad3526f87d54958b1f48745e6f1315f3f52c0c3d
author John Shao <johnshao@google.com> Mon Aug 22 19:30:13 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 22 19:30:14 2016 +0000
tree 459ead7e0d93240c4d203ab40c1406bfa3104b6a
parent 8a8e6fa06e890ec2b0b690ed5300487a4be8bb89
parent 4a28965efa79c78e9e0f1144c08f87887a5e763e

Merge "Fix for LMP crash for Fragment.getContext()" into ub-contactsdialer-g-dev

src/com/android/contacts/editor/ContactEditorBaseFragment.java

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);