summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaesu Lee <taesu82.lee@samsung.com>2018-04-03 16:25:07 +0900
committerMichael Bestas <mkbestas@lineageos.org>2019-09-15 01:37:54 +0300
commit3a9c228d15c752ab491beada54ba50075ca85015 (patch)
treea58eaf4ecb6a5458ad9cf5cad5def2839ad1e2b7
parentb7994997be2537a14cb5182abce38a7cd0e0ade0 (diff)
downloadandroid_packages_apps_Messaging-3a9c228d15c752ab491beada54ba50075ca85015.tar.gz
android_packages_apps_Messaging-3a9c228d15c752ab491beada54ba50075ca85015.tar.bz2
android_packages_apps_Messaging-3a9c228d15c752ab491beada54ba50075ca85015.zip
Fix assertion failures caused by different instance type
onAttachFragment() with ReportFragment instance is called first since Support Library 26.1.0 has been applied. Remove assert() and check instance to fix crash caused by the ReportFragement. Test: Manual Change-Id: I5a4d6bdd00ac94c5892527f5fe784b8f19701214 Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
-rw-r--r--src/com/android/messaging/ui/VCardDetailActivity.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/com/android/messaging/ui/VCardDetailActivity.java b/src/com/android/messaging/ui/VCardDetailActivity.java
index fecdc34..b9fb3d1 100644
--- a/src/com/android/messaging/ui/VCardDetailActivity.java
+++ b/src/com/android/messaging/ui/VCardDetailActivity.java
@@ -37,11 +37,13 @@ public class VCardDetailActivity extends BugleActionBarActivity {
@Override
public void onAttachFragment(final Fragment fragment) {
- Assert.isTrue(fragment instanceof VCardDetailFragment);
- final Uri vCardUri = getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI);
- Assert.notNull(vCardUri);
- final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment;
- vCardDetailFragment.setVCardUri(vCardUri);
+ if (fragment instanceof VCardDetailFragment) {
+ final Uri vCardUri =
+ getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI);
+ Assert.notNull(vCardUri);
+ final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment;
+ vCardDetailFragment.setVCardUri(vCardUri);
+ }
}
@Override