Merge "Fix crash with null intent" into lmp-dev (ac57338b) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/quickcontact/QuickContactActivity.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -1438,10 +1438,8 @@ public class QuickContactActivity extends ContactsActivity {
		// Do not set the alternate intent is there are no resolves
		if (!PhoneCapabilityTester.isIntentRegistered(context, alternateIntent)) {
		alternateIntent = null;
		}

		} else if (TextUtils.isEmpty(alternateContentDescription)) {
		// Attempt to use package manager to find a suitable content description if needed
		if (TextUtils.isEmpty(alternateContentDescription)) {
		alternateContentDescription.append(getIntentResolveLabel(alternateIntent, context));
		}
		}