Merge "Fix the NPE in the Settings Tile lib" into udc-d1-dev (2be625e2) · Commits · e / os / android_frameworks_base

packages/SettingsLib/Tile/src/com/android/settingslib/drawer/Tile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -284,10 +284,10 @@ public abstract class Tile implements Parcelable {
		* Optional key to use for this tile.
		*/
		public String getKey(Context context) {
		ensureMetadataNotStale(context);
		if (!hasKey()) {
		return null;
		}
		ensureMetadataNotStale(context);
		if (mMetaData.get(META_DATA_PREFERENCE_KEYHINT) instanceof Integer) {
		return context.getResources().getString(mMetaData.getInt(META_DATA_PREFERENCE_KEYHINT));
		} else {