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

Commit 7d57e8e4 authored by Xin Li's avatar Xin Li
Browse files

Merge Android R 

Bug: 168057903
Merged-In: I22ea459266eeb88509fefb34277e6426166e2502
Change-Id: I61f0ddc32a51997cca143ec58d0a6b08453a8b32
parents b1afe09d e1e08fc8

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ cc_library_static { 
    ],



    shared_libs: [

        "libfusesideload",

        "librecovery_ui",

    ],

}

recovery.cpp

+0 −6
Original line number Diff line number Diff line
@@ -746,12 +746,6 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri 
        set_retry_bootloader_message(retry_count + 1, args);

      }



      if (update_package[0] == '@') {

        ensure_path_mounted(update_package + 1);

      } else {

        ensure_path_mounted(update_package);

      }



      bool should_use_fuse = false;

      if (!SetupPackageMount(update_package, &should_use_fuse)) {

        LOG(INFO) << "Failed to set up the package access, skipping installation";

tools/image_generator/ImageGenerator.java

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class ImageGenerator { 
                    put("hy", "NotoSansArmenian-Regular");

                    put("iw", "NotoSansHebrew-Regular");

                    put("ja", "NotoSansCJK-Regular");

                    put("ka", "NotoSansGeorgian-Regular");

                    put("ka", "NotoSansGeorgian-VF");

                    put("ko", "NotoSansCJK-Regular");

                    put("km", "NotoSansKhmerUI-Regular");

                    put("kn", "NotoSansKannadaUI-Regular");