summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts
diff options
context:
space:
mode:
authortaiki tsutsumi <taiki.tsutsumi@sony.com>2017-11-08 20:49:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-08 20:49:03 +0000
commit7375d813b23f0ac20cb374e1467356391b2dda72 (patch)
treed5ec597866a5027e5a29818c735e1349a0758e3c /src/com/android/contacts
parent1dccc182142ee6d3fc7c141804da7fdedb8cc9e6 (diff)
parente18600ad6c8bf37e6ff37d6391c560bcd9c5d77e (diff)
downloadpackages_apps_Contacts-7375d813b23f0ac20cb374e1467356391b2dda72.tar.gz
packages_apps_Contacts-7375d813b23f0ac20cb374e1467356391b2dda72.tar.bz2
packages_apps_Contacts-7375d813b23f0ac20cb374e1467356391b2dda72.zip
Merge "Fixed issue that cannot bring My info via Android Beam" am: 775103a3fd am: 3cf86f22e2
am: e18600ad6c Change-Id: I8bc83a97a9d6940bbfbf462b8b6a5a32901bfc26
Diffstat (limited to 'src/com/android/contacts')
-rw-r--r--src/com/android/contacts/quickcontact/QuickContactActivity.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index c8b2fa09d..e985bbff5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1033,8 +1033,6 @@ public class QuickContactActivity extends ContactsActivity {
mCachedCp2DataCardModel = null;
}
mContactLoader.forceLoad();
-
- NfcHandler.register(this, mLookupUri);
}
private void destroyInteractionLoaders() {
@@ -1157,6 +1155,7 @@ public class QuickContactActivity extends ContactsActivity {
}
};
mEntriesAndActionsTask.execute();
+ NfcHandler.register(this, mContactData.getLookupUri());
}
private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {