diff options
| author | Matt Garnes <matt@cyngn.com> | 2015-04-30 10:33:15 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-04-30 10:33:15 -0700 |
| commit | 6825b2dc0c51e7cb9ce3ee2e5e32fec821c4c299 (patch) | |
| tree | 3122cf62c8cc8e7f5b186754e61d80e8774b516b /src/com/android/contacts/quickcontact/MyQrcodeActivity.java | |
| parent | e00a2a6518e83990dd19c09d55fa2d59d4bfac6e (diff) | |
| parent | 75209bbb8d7be819cf9dce121da371d90e5685e1 (diff) | |
| download | packages_apps_Contacts-caf/cm-12.1.tar.gz packages_apps_Contacts-caf/cm-12.1.tar.bz2 packages_apps_Contacts-caf/cm-12.1.zip | |
Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1caf/cm-12.1
Diffstat (limited to 'src/com/android/contacts/quickcontact/MyQrcodeActivity.java')
| -rw-r--r-- | src/com/android/contacts/quickcontact/MyQrcodeActivity.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/contacts/quickcontact/MyQrcodeActivity.java b/src/com/android/contacts/quickcontact/MyQrcodeActivity.java index eaa89edb6..d1b69820b 100644 --- a/src/com/android/contacts/quickcontact/MyQrcodeActivity.java +++ b/src/com/android/contacts/quickcontact/MyQrcodeActivity.java @@ -212,8 +212,7 @@ public class MyQrcodeActivity extends Activity { myProfile = RCSUtil.createLocalProfile(mRawContact); updateDisplayNumber(myProfile); if (!decodeStringAndSetBitmap(imgString)) { - if (null != myProfile.getFirstName() - || !TextUtils.isEmpty(myProfile.getFirstName())) { + if (null != myProfile || !TextUtils.isEmpty(myProfile.getFirstName())) { createProgressDialog(); // downloadProfile(myProfile); getQRcodeFromService(myProfile); |