PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanups in XmlParserUtils."

Browse Source
This commit is contained in:
Rajeev Kumar
2017-07-14 21:16:07 +00:00
committed by Android (Google) Code Review
parent b9e256a908 cbbc28006f
commit 739836883b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/search/XmlParserUtils.java
View File

@@ -17,11 +17,11 @@
package com.android.settings.search; package com.android.settings.search;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.TypedValue; import android.util.TypedValue;
import com.android.settings.R; import com.android.settings.R;
/** /**
@@ -87,17 +87,18 @@ public class XmlParserUtils {
R.styleable.Preference_android_fragment); R.styleable.Preference_android_fragment);
} }
@Nullable
private static String getData(Context context, AttributeSet set, int[] attrs, int resId) { private static String getData(Context context, AttributeSet set, int[] attrs, int resId) {
final TypedArray ta = context.obtainStyledAttributes(set, attrs); final TypedArray ta = context.obtainStyledAttributes(set, attrs);
String data = ta.getString(resId); String data = ta.getString(resId);
ta.recycle(); ta.recycle();
return (data != null) ? data.toString() : null; return data;
} }
private static String getDataEntries(Context context, AttributeSet set, int[] attrs, int resId) { private static String getDataEntries(Context context, AttributeSet set, int[] attrs, int resId) {
final TypedArray sa = context.obtainStyledAttributes(set, attrs); final TypedArray sa = context.obtainStyledAttributes(set, attrs);
final TypedValue tv = sa.peekValue(resId); final TypedValue tv = sa.peekValue(resId);
sa.recycle();
String[] data = null; String[] data = null;
if (tv != null && tv.type == TypedValue.TYPE_REFERENCE) { if (tv != null && tv.type == TypedValue.TYPE_REFERENCE) {
if (tv.resourceId != 0) { if (tv.resourceId != 0) {