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

Commit a2307aef authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Only restorecon_data once for all users. 

restorecon_data already iterates across all found users internally,
so we don't need to call it for each UID moved.  In fact, this was a
bug that caused data for the owner to be relabeled when moving apps
back to internal storage.

Bug: 21813384
Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
parent 5f920c1a

cmds/installd/commands.cpp

+4 −4
Original line number Diff line number Diff line
@@ -257,12 +257,12 @@ int copy_complete_app(const char *from_uuid, const char *to_uuid, 
                    << ": status " << rc;

            goto fail;

        }

    }



        if (restorecon_data(to_uuid, package_name, seinfo, uid) != 0) {

            LOG(ERROR) << "Failed to restorecon " << to;

    if (restorecon_data(to_uuid, package_name, seinfo, multiuser_get_uid(0, appid)) != 0) {

        LOG(ERROR) << "Failed to restorecon";

        goto fail;

    }

    }



    // We let the framework scan the new location and persist that before

    // deleting the data in the old location; this ordering ensures that