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

Commit ac4a6fcc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Dexopt: fix a bug due to unsign int." am: 2d95bb9d am: d9be9588 am:... 

Merge "Dexopt: fix a bug due to unsign int." am: 2d95bb9d am: d9be9588 am: d4088836 am: 623da181

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1500650

Change-Id: Ia1dd27ede31d0942e175edff513bbdee5312eed9
parents 7d755401 623da181

cmds/installd/dexopt.cpp

+10 −4
Original line number Diff line number Diff line
@@ -450,16 +450,22 @@ class RunProfman : public ExecVHelper { 
            AddArg("--boot-image-merge");

        }



        // The percent won't exceed 100, otherwise, don't set it and use the

        // default one set in profman.

        uint32_t min_new_classes_percent_change = ::android::base::GetUintProperty<uint32_t>(

            "dalvik.vm.bgdexopt.new-classes-percent", /*default*/-1);

        if (min_new_classes_percent_change >= 0 && min_new_classes_percent_change <= 100) {

            "dalvik.vm.bgdexopt.new-classes-percent",

            /*default*/std::numeric_limits<uint32_t>::max());

        if (min_new_classes_percent_change <= 100) {

          AddArg("--min-new-classes-percent-change=" +

                 std::to_string(min_new_classes_percent_change));

        }



        // The percent won't exceed 100, otherwise, don't set it and use the

        // default one set in profman.

        uint32_t min_new_methods_percent_change = ::android::base::GetUintProperty<uint32_t>(

            "dalvik.vm.bgdexopt.new-methods-percent", /*default*/-1);

        if (min_new_methods_percent_change >=0 && min_new_methods_percent_change <= 100) {

            "dalvik.vm.bgdexopt.new-methods-percent",

            /*default*/std::numeric_limits<uint32_t>::max());

        if (min_new_methods_percent_change <= 100) {

          AddArg("--min-new-methods-percent-change=" +

                 std::to_string(min_new_methods_percent_change));

        }