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 am: f390d17b40 am: 8ded71f805

Browse Source 
am: f05af1e2a8

Change-Id: I37071d8c4342a41c0fd86036740aaa8ce0271f53
This commit is contained in:
Taesu Lee
2019-06-21 15:56:04 -07:00
committed by android-build-merger
parent 80f974e73e f05af1e2a8
commit 315a07d50e
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/ui/BlockedParticipantsActivity.java
-7
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()) {
src/com/android/messaging/ui/VCardDetailActivity.java
+7 -5
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