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

Commit 3d8fb24c authored by Yabin Cui's avatar Yabin Cui Committed by android-build-merger
Browse files

Merge "libpackagelistparser: export profileable_from_shell flag." 

am: d220cdc7

Change-Id: I6da5bafd26bacd69b3253aa1bd32fc0cf4587481
parents 3cd91d9c d220cdc7

libpackagelistparser/include/packagelistparser/packagelistparser.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct pkg_info { 
    char *seinfo;

    gid_list gids;

    void *private_data;

    bool profileable_from_shell;

};



/**

libpackagelistparser/packagelistparser.c

+17 −0
Original line number Diff line number Diff line
@@ -223,6 +223,23 @@ extern bool packagelist_parse(pfn_on_package callback, void *userdata) 
            }

        }



        cur = strsep(&next, " \t\r\n");

        if (cur) {

            tmp = strtoul(cur, &endptr, 10);

            if (*endptr != '\0') {

                errmsg = "Could not convert field \"profileable_from_shell\" to integer value";

                goto err;

            }



            /* should be a valid boolean of 1 or 0 */

            if (!(tmp == 0 || tmp == 1)) {

                errmsg = "Field \"profileable_from_shell\" is not 0 or 1 boolean value";

                goto err;

            }



            pkg_info->profileable_from_shell = (bool)tmp;

        }



        rc = callback(pkg_info, userdata);

        if (rc == false) {

            /*