Check null for preventing NPE (60f19645) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/calllog/CallLogFragment.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -273,13 +273,18 @@ public class CallLogFragment extends ListFragment implements ViewPagerVisibility
		@Override
		public void onPrepareOptionsMenu(Menu menu) {
		if (mShowOptionsMenu) {
		menu.findItem(R.id.delete_all).setEnabled(mAdapter != null && !mAdapter.isEmpty());
		final MenuItem itemDeleteAll = menu.findItem(R.id.delete_all);
		// Check if all the menu items are inflated correctly. As a shortcut, we assume all
		// menu items are ready if the first item is non-null.
		if (itemDeleteAll != null) {
		itemDeleteAll.setEnabled(mAdapter != null && !mAdapter.isEmpty());
		menu.findItem(R.id.show_voicemails_only).setVisible(
		mVoicemailSourcesAvailable && !mShowingVoicemailOnly);
		menu.findItem(R.id.show_all_calls).setVisible(
		mVoicemailSourcesAvailable && mShowingVoicemailOnly);
		}
		}
		}

		@Override
		public boolean onOptionsItemSelected(MenuItem item) {

+6 −0

Original line number	Diff line number	Diff line
		@@ -583,6 +583,12 @@ public class DialpadFragment extends Fragment
		final MenuItem twoSecPauseMenuItem = menu.findItem(R.id.menu_2s_pause);
		final MenuItem waitMenuItem = menu.findItem(R.id.menu_add_wait);

		// Check if all the menu items are inflated correctly. As a shortcut, we assume all menu
		// items are ready if the first item is non-null.
		if (callSettingsMenuItem == null) {
		return;
		}

		final Activity activity = getActivity();
		if (activity != null && ViewConfiguration.get(activity).hasPermanentMenuKey()) {
		// Call settings should be available via its parent Activity.