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

Merge changes I7218f17a,I96b7340a

Browse Source 
am: 111c955d1d

Change-Id: I64cb964b751561e87115976866646b1db3858e14
This commit is contained in:
Mårten Kongstad
2017-08-31 21:44:25 +00:00
committed by android-build-merger
parent c2351d1d40 111c955d1d
commit 96e763fe71
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ResourcesManager.java
View File

@@ -964,7 +964,7 @@ public class ResourcesManager {
// TODO(adamlesinski): Make this accept more than just overlay directories. // TODO(adamlesinski): Make this accept more than just overlay directories.
final void applyNewResourceDirsLocked(@NonNull final String baseCodePath, final void applyNewResourceDirsLocked(@NonNull final String baseCodePath,
@NonNull final String[] newResourceDirs) { @Nullable final String[] newResourceDirs) {
try { try {
Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
"ResourcesManager#applyNewResourceDirsLocked"); "ResourcesManager#applyNewResourceDirsLocked");

1
tools/aapt2/link/ManifestFixer.cpp
View File

@@ -293,6 +293,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor,
manifest_action["instrumentation"]["meta-data"] = meta_data_action; manifest_action["instrumentation"]["meta-data"] = meta_data_action;
manifest_action["original-package"]; manifest_action["original-package"];
manifest_action["overlay"];
manifest_action["protected-broadcast"]; manifest_action["protected-broadcast"];
manifest_action["uses-permission"]; manifest_action["uses-permission"];
manifest_action["uses-permission-sdk-23"]; manifest_action["uses-permission-sdk-23"];