Snap for 4894319 from d6bec45214831ba70d096fe27d2d37712d522574 to qt-release (a1b3b054) · Commits · e / os / android_packages_apps_SettingsIntelligence

src/com/android/settings/intelligence/suggestions/model/CandidateSuggestion.java

+19 −8

Original line number	Diff line number	Diff line
		@@ -182,6 +182,8 @@ public class CandidateSuggestion {
		// First get override data
		final Bundle overrideData = getOverrideData(metaData);
		// Get icon
		icon = getIconFromBundle(overrideData, META_DATA_PREFERENCE_ICON);
		if (icon == null) {
		if (metaData.containsKey(META_DATA_PREFERENCE_ICON)) {
		iconRes = metaData.getInt(META_DATA_PREFERENCE_ICON);
		} else {
		@@ -191,6 +193,7 @@ public class CandidateSuggestion {
		icon = Icon.createWithResource(
		mResolveInfo.activityInfo.packageName, iconRes);
		}
		}
		// Get title
		title = getStringFromBundle(overrideData, META_DATA_PREFERENCE_TITLE);
		if (TextUtils.isEmpty(title) && metaData.containsKey(META_DATA_PREFERENCE_TITLE)) {
		@@ -241,6 +244,14 @@ public class CandidateSuggestion {
		return bundle.getString(key);
		}

		/** Extracts an Icon object from bundle. */
		private Icon getIconFromBundle(Bundle bundle, String key) {
		if (bundle == null \|\| TextUtils.isEmpty(key)) {
		return null;
		}
		return bundle.getParcelable(key);
		}

		private Bundle getOverrideData(Bundle metadata) {
		if (metadata == null \|\| !metadata.containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {
		Log.d(TAG, "Metadata null or has no info about summary_uri");