Fix NPE caused by the selected entry is not valid when make a phone call (67205edb) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/ViewContactActivity.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -715,17 +715,20 @@ public class ViewContactActivity extends Activity
		int index = mListView.getSelectedItemPosition();
		if (index != -1) {
		ViewEntry entry = ViewAdapter.getEntry(mSections, index, SHOW_SEPARATORS);
		if (entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
		if (entry != null &&
		entry.intent.getAction() == Intent.ACTION_CALL_PRIVILEGED) {
		startActivity(entry.intent);
		return true;
		}
		} else if (mPrimaryPhoneUri != null) {
		// There isn't anything selected, call the default number
		final Intent intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
		mPrimaryPhoneUri);
		startActivity(intent);
		}
		return true;
		}
		return false;
		}

		case KeyEvent.KEYCODE_DEL: {
		if (mReadOnlySourcesCnt > 0 & mWritableSourcesCnt > 0) {