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

Commit 78f1f5a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Badging should print compiled platform version"

parents 002914a2 a36cc98a

tools/aapt2/dump/DumpManifest.cpp

+16 −1
Original line number Diff line number Diff line
@@ -291,8 +291,11 @@ class ManifestExtractor { 
            }

          }

        }



        if (!attr->value.empty()) {

          return &attr->value;

        }

      }

      return nullptr;

    }
@@ -425,6 +428,8 @@ class Manifest : public ManifestExtractor::Element { 
  const std::string* split = nullptr;

  const std::string* platformVersionName = nullptr;

  const std::string* platformVersionCode = nullptr;

  const int32_t* platformVersionNameInt = nullptr;

  const int32_t* platformVersionCodeInt = nullptr;

  const int32_t* compilesdkVersion = nullptr;

  const std::string* compilesdkVersionCodename = nullptr;

  const int32_t* installLocation = nullptr;
@@ -440,6 +445,10 @@ class Manifest : public ManifestExtractor::Element { 
                                                           "platformBuildVersionName"));

    platformVersionCode = GetAttributeString(FindAttribute(manifest, {},

                                                           "platformBuildVersionCode"));

    platformVersionNameInt = GetAttributeInteger(FindAttribute(manifest, {},

                                                               "platformBuildVersionName"));

    platformVersionCodeInt = GetAttributeInteger(FindAttribute(manifest, {},

                                                               "platformBuildVersionCode"));



    // Extract the compile sdk info

    compilesdkVersion = GetAttributeInteger(FindAttribute(manifest, COMPILE_SDK_VERSION_ATTR));
@@ -460,9 +469,15 @@ class Manifest : public ManifestExtractor::Element { 
    if (platformVersionName) {

      printer->Print(StringPrintf(" platformBuildVersionName='%s'", platformVersionName->data()));

    }

    if (platformVersionNameInt) {

      printer->Print(StringPrintf(" platformBuildVersionName='%d'", *platformVersionNameInt));

    }

    if (platformVersionCode) {

      printer->Print(StringPrintf(" platformBuildVersionCode='%s'", platformVersionCode->data()));

    }

    if (platformVersionCodeInt) {

      printer->Print(StringPrintf(" platformBuildVersionCode='%d'", *platformVersionCodeInt));

    }

    if (compilesdkVersion) {

      printer->Print(StringPrintf(" compileSdkVersion='%d'", *compilesdkVersion));

    }