Merge "Remove obtainStyledAttribute and AssetManager2::GetBag tracing" into qt-dev (d0b473fc) · Commits · e / os / android_frameworks_base

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

+2 −5

Original line number	Diff line number	Diff line
		@@ -1390,11 +1390,9 @@ public class ResourcesImpl {
		@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;
		array = TypedArray.obtain(wrapper.getResources(), len);
		final TypedArray 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
		@@ -1405,10 +1403,9 @@ public class ResourcesImpl {
		array.mDataAddress, array.mIndicesAddress);
		array.mTheme = wrapper;
		array.mXml = parser;
		}
		Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
		return array;
		}
		}

		@NonNull
		TypedArray resolveAttributes(@NonNull Resources.Theme wrapper,

+0 −2

Original line number	Diff line number	Diff line
		@@ -778,8 +778,6 @@ const ResolvedBag* AssetManager2::GetBag(uint32_t resid) {
		}

		const ResolvedBag* AssetManager2::GetBag(uint32_t resid, std::vector<uint32_t>& child_resids) {
		ATRACE_NAME("AssetManager::GetBag");

		auto cached_iter = cached_bags_.find(resid);
		if (cached_iter != cached_bags_.end()) {
		return cached_iter->second.get();