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

Merge changes I7218f17a,I96b7340a am: 111c955d1d am: 96e763fe71

Browse Source 
am: 38f0f5687f

Change-Id: I8d3c46d10463f4c64f7ef96006c31c1343710f53
This commit is contained in:
Mårten Kongstad
2017-08-31 22:03:11 +00:00
committed by android-build-merger
parent b32153e3d2 38f0f5687f
commit 4f4a341402
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.
final void applyNewResourceDirsLocked(@NonNull final String baseCodePath,
@NonNull final String[] newResourceDirs) {
@Nullable final String[] newResourceDirs) {
try {
Trace.traceBegin(Trace.TRACE_TAG_RESOURCES,
"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["original-package"];
manifest_action["overlay"];
manifest_action["protected-broadcast"];
manifest_action["uses-permission"];
manifest_action["uses-permission-sdk-23"];