Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obtainStyledAttribute and AssetManager2::GetBag tracing" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-21 16:00:04 +00:00
committed by Android (Google) Code Review
parent f953da0c20 4487398e0d
commit bdc1ba53ef
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/content/res/ResourcesImpl.java
View File

@@ -1390,11 +1390,9 @@ public class ResourcesImpl {
@StyleableRes int[] attrs, @StyleableRes int[] attrs,
@AttrRes int defStyleAttr, @AttrRes int defStyleAttr,
@StyleRes int defStyleRes) { @StyleRes int defStyleRes) {
Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, "obtainStyledAttributes");
TypedArray array;
synchronized (mKey) { synchronized (mKey) {
final int len = attrs.length; 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. // XXX note that for now we only work with compiled XML files.
// To support generic XML files we will need to manually parse // To support generic XML files we will need to manually parse
@@ -1405,9 +1403,8 @@ public class ResourcesImpl {
array.mDataAddress, array.mIndicesAddress); array.mDataAddress, array.mIndicesAddress);
array.mTheme = wrapper; array.mTheme = wrapper;
array.mXml = parser; array.mXml = parser;
return array;
} }
Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);
return array;
} }
@NonNull @NonNull

2
libs/androidfw/AssetManager2.cpp
View File

@@ -778,8 +778,6 @@ const ResolvedBag* AssetManager2::GetBag(uint32_t resid) {
} }
const ResolvedBag* AssetManager2::GetBag(uint32_t resid, std::vector<uint32_t>& child_resids) { const ResolvedBag* AssetManager2::GetBag(uint32_t resid, std::vector<uint32_t>& child_resids) {
ATRACE_NAME("AssetManager::GetBag");
auto cached_iter = cached_bags_.find(resid); auto cached_iter = cached_bags_.find(resid);
if (cached_iter != cached_bags_.end()) { if (cached_iter != cached_bags_.end()) {
return cached_iter->second.get(); return cached_iter->second.get();