From cbbc28006fd839d0d1dc3b5c20a7e3b96fa58073 Mon Sep 17 00:00:00 2001
From: Rajeev Kumar <rajekumar@google.com>
Date: Thu, 13 Jul 2017 19:25:23 -0700
Subject: [PATCH] Cleanups in XmlParserUtils.

1. Get rid of redundant toString call from getData method.
2. Recycle TypedArray.

Test: make RunSettingsRoboTests -j40
Change-Id: Id7e9e442aaf449d46131fa4f3d5a7f0457069159
---
 src/com/android/settings/search/XmlParserUtils.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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