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

Merge "Fix assertion failures caused by different instance type" am: 5500d33555

Browse Source 
am: f390d17b40

Change-Id: I3c04d7dcfbaf99bac711a3f1eff8ee1791d8f438
This commit is contained in:
Taesu Lee
2019-06-21 15:41:00 -07:00
committed by android-build-merger
parent f9b474c443 f390d17b40
commit 8ded71f805
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; package com.android.messaging.ui;
import android.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem; import android.view.MenuItem;
import com.android.messaging.R; import com.android.messaging.R;
import com.android.messaging.util.Assert;
/** /**
* Show a list of currently blocked participants. * Show a list of currently blocked participants.
@@ -36,11 +34,6 @@ public class BlockedParticipantsActivity extends BugleActionBarActivity {
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
} }
@Override
public void onAttachFragment(final Fragment fragment) {
Assert.isTrue(fragment instanceof BlockedParticipantsFragment);
}
@Override @Override
public boolean onOptionsItemSelected(final MenuItem item) { public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {

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

@@ -37,11 +37,13 @@ public class VCardDetailActivity extends BugleActionBarActivity {
@Override @Override
public void onAttachFragment(final Fragment fragment) { public void onAttachFragment(final Fragment fragment) {
Assert.isTrue(fragment instanceof VCardDetailFragment); if (fragment instanceof VCardDetailFragment) {
final Uri vCardUri = getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI); final Uri vCardUri =
Assert.notNull(vCardUri); getIntent().getParcelableExtra(UIIntents.UI_INTENT_EXTRA_VCARD_URI);
final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment; Assert.notNull(vCardUri);
vCardDetailFragment.setVCardUri(vCardUri); final VCardDetailFragment vCardDetailFragment = (VCardDetailFragment) fragment;
vCardDetailFragment.setVCardUri(vCardUri);
}
} }
@Override @Override