Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5721db90 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge changes I7218f17a,I96b7340a am: 111c955d am: 96e763fe am:... 

Merge "Merge changes I7218f17a,I96b7340a am: 111c955d am: 96e763fe am: 38f0f568 am: 4f4a3414"
parents 83de4b7b 58396d4e

core/java/android/app/ResourcesManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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");

tools/aapt2/link/ManifestFixer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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"];