am 87ed0a10: Merge "Bug fix on installd with SELinux enabled kernel." (eacbc280) · Commits · e / os / android_frameworks_base

cmds/installd/commands.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -91,13 +91,6 @@ int install(const char *pkgname, uid_t uid, gid_t gid)
		return -1;
		}

		if (selinux_android_setfilecon(libsymlink, pkgname, AID_SYSTEM) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", libsymlink, strerror(errno));
		unlink(libsymlink);
		unlink(pkgdir);
		return -1;
		}

		if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
		unlink(libsymlink);
		@@ -252,13 +245,6 @@ int make_user_data(const char *pkgname, uid_t uid, uid_t persona)
		return -1;
		}

		if (selinux_android_setfilecon(libsymlink, pkgname, AID_SYSTEM) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", libsymlink, strerror(errno));
		unlink(libsymlink);
		unlink(pkgdir);
		return -errno;
		}

		if (selinux_android_setfilecon(pkgdir, pkgname, uid) < 0) {
		ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));
		unlink(libsymlink);