commit 2ef633835179aaa04dd497c59ee07253a436ee1c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 24 00:11:50 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 24 00:11:50 2018 +0000
tree 24b2c8c42486bba9f9f7027f346660e528e491db
parent 713eef404ecee089dc35074021dffe43099badbd
parent c37457799be3db0590a5d94832b2fef5f64ef439

Merge "Add more tracing for obtainStyledAttributes"

core/java/android/content/res/ResourcesImpl.java

diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java
index 19e399a..7d9af00 100644
--- a/core/java/android/content/res/ResourcesImpl.java
+++ b/core/java/android/content/res/ResourcesImpl.java
@@ -1343,9 +1343,11 @@
                 @StyleableRes int[] attrs,
                 @AttrRes int defStyleAttr,
                 @StyleRes int defStyleRes) {
+            Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "obtainStyledAttributes");
+            TypedArray array;
             synchronized (mKey) {
                 final int len = attrs.length;
-                final TypedArray array = TypedArray.obtain(wrapper.getResources(), len);
+                array = TypedArray.obtain(wrapper.getResources(), len);
 
                 // XXX note that for now we only work with compiled XML files.
                 // To support generic XML files we will need to manually parse
@@ -1356,8 +1358,9 @@
                         array.mDataAddress, array.mIndicesAddress);
                 array.mTheme = wrapper;
                 array.mXml = parser;
-                return array;
             }
+            Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
+            return array;
         }
 
         @NonNull