Merge "Fix NPE in CustomContactListFilterActivity" into ub-contactsdialer-g-dev (32876909) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/common/list/CustomContactListFilterActivity.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -366,13 +366,14 @@ public class CustomContactListFilterActivity extends Activity implements
		}
		} else {
		final Integer titleRes = getAsInteger(Groups.TITLE_RES);
		if (titleRes != null) {
		if (titleRes != null && titleRes != 0) {
		final String packageName = getAsString(Groups.RES_PACKAGE);
		if (packageName != null) {
		return context.getPackageManager().getText(packageName, titleRes, null);
		} else {
		return getAsString(Groups.TITLE);
		}
		}
		return getAsString(Groups.TITLE);
		}
		}

		/**