filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assertion failures caused by different instance type

Browse Source 
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>
This commit is contained in:
Taesu Lee
2018-04-03 16:25:07 +09:00
parent 1e56062ac9
commit 2771ac7ae9
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/messaging/ui/BlockedParticipantsActivity.java
View File

@@ -16,12 +16,10 @@
package com.android.messaging.ui;
import android.app.Fragment;
import android.os.Bundle;
import android.view.MenuItem;
import com.android.messaging.R;
import com.android.messaging.util.Assert;
/**
* Show a list of currently blocked participants.
@@ -36,11 +34,6 @@ public class BlockedParticipantsActivity extends BugleActionBarActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public void onAttachFragment(final Fragment fragment) {
Assert.isTrue(fragment instanceof BlockedParticipantsFragment);
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {

12
src/com/android/messaging/ui/VCardDetailActivity.java
View File

@@ -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