Merge "Check if menu item is null before adding assistant new badge" into ub-contactsdialer-h-dev (f1b3dc47) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ContactsDrawerActivity.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -265,8 +265,12 @@ public abstract class ContactsDrawerActivity extends AppCompatContactsActivity i
		if (mNavigationView == null) {
		return;
		}
		final LinearLayout newBadgeFrame = (LinearLayout) MenuItemCompat.getActionView(
		mNavigationView.getMenu().findItem(R.id.nav_assistant));
		final MenuItem assistantMenu = mNavigationView.getMenu().findItem(R.id.nav_assistant);
		if (assistantMenu == null) {
		return;
		}
		final LinearLayout newBadgeFrame =
		(LinearLayout) MenuItemCompat.getActionView(assistantMenu);
		final boolean showWelcomeBadge = !SharedPreferenceUtil.isWelcomeCardDismissed(this);
		if (showWelcomeBadge && newBadgeFrame.getChildCount() == 0) {
		if (mAssistantNewBadge == null) {