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

Commit 111c955d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I7218f17a,I96b7340a 

* changes:
  ResourcesManager: correct @NonNull -> @Nullable
  AAPT2: Allow <overlay> in AndroidManifest.xml
parents 637dbcbb 7a242216

core/java/android/app/ResourcesManager.java

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

tools/aapt2/link/ManifestFixer.cpp

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