Merge "run-as: remove a special case." into main (dbb4a111) · Commits · e / os / android_system_core

run-as/run-as.cpp

+6 −8

Original line number	Original line	Diff line number	Diff line
	@@ -196,14 +196,6 @@ int main(int argc, char* argv[]) {
	}		}
	if (setegid(old_egid) == -1) error(1, errno, "couldn't restore egid");		if (setegid(old_egid) == -1) error(1, errno, "couldn't restore egid");

	// Handle a multi-user data path
	if (userId > 0) {
	free(info.data_dir);
	if (asprintf(&info.data_dir, "/data/user/%d/%s", userId, pkgname) == -1) {
	error(1, errno, "asprintf failed");
	}
	}

	if (info.uid == 0) {		if (info.uid == 0) {
	error(1, 0, "unknown package: %s", pkgname);		error(1, 0, "unknown package: %s", pkgname);
	}		}
	@@ -226,6 +218,12 @@ int main(int argc, char* argv[]) {
	error(1, 0, "package not debuggable: %s", pkgname);		error(1, 0, "package not debuggable: %s", pkgname);
	}		}

			// Ensure we have the right data path for the specific user.
			free(info.data_dir);
			if (asprintf(&info.data_dir, "/data/user/%d/%s", userId, pkgname) == -1) {
			error(1, errno, "asprintf failed");
			}

	// Check that the data directory path is valid.		// Check that the data directory path is valid.
	check_data_path(pkgname, info.data_dir, userAppId);		check_data_path(pkgname, info.data_dir, userAppId);