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

Commit f038ca00 authored by Tao Bao's avatar Tao Bao
Browse files

recovery: Remove obsolete code that supports "CACHE:foo" format. 

The passing of "--update_package=CACHE:foo" format has been removed
in Gingerbread, with commit 4baf641e7d96375eba3f9a3aff5400b9e3d28cd6
in frameworks/base (core/java/android/os/RecoverySystem.java).

Test: Recovery image with --update_package still works.
Change-Id: I37b56ccf98f62cadf2a3975bbc38b16fea6fe9a1
parent f28afc19

recovery.cpp

+1 −21
Original line number Diff line number Diff line
@@ -1525,27 +1525,7 @@ int main(int argc, char **argv) { 
    for (const auto& arg : args) {

        printf(" \"%s\"", arg.c_str());

    }

    printf("\n");



    if (update_package) {

        // For backwards compatibility on the cache partition only, if

        // we're given an old 'root' path "CACHE:foo", change it to

        // "/cache/foo".

        if (strncmp(update_package, "CACHE:", 6) == 0) {

            int len = strlen(update_package) + 10;

            char* modified_path = (char*)malloc(len);

            if (modified_path) {

                strlcpy(modified_path, "/cache/", len);

                strlcat(modified_path, update_package+6, len);

                printf("(replacing path \"%s\" with \"%s\")\n",

                       update_package, modified_path);

                update_package = modified_path;

            }

            else

                printf("modified_path allocation failed\n");

        }

    }

    printf("\n");

    printf("\n\n");



    property_list(print_property, NULL);

    printf("\n");